Refine the 'Change profile' action.

- Rename it into 'Switch Profile' to avoid potential confusion.
- Also put it under the 'Settings' menu.

TODO: rename related methods which use 'change' in their names.

BUG: 245795
FIXED-IN:4.8
REVIEW: 102686
wilder-portage
Jekyll Wu 15 years ago
parent 127c2b523e
commit 989033462f
  1. 8
      desktop/partui.rc
  2. 7
      desktop/sessionui.rc
  3. 4
      src/SessionController.cpp

@ -1,6 +1,6 @@
<!DOCTYPE kpartgui>
<kpartgui name="konsolepart" version="4">
<kpartgui name="konsolepart" version="5">
<Menu name="session-popup-menu">
<Action name="edit_copy"/>
<Action name="edit_paste"/>
@ -14,7 +14,7 @@
</Menu>
<Action name="open-browser"/>
<Separator/>
<Action name="change-profile"/>
<Action name="switch-profile"/>
<Action name="edit-current-profile"/>
<Separator/>
<Action name="show-menubar"/>
@ -22,8 +22,8 @@
<Separator/>
<Action name="close-session"/>
</Menu>
<Menu name="change-profile">
<text>&amp;Change Profile</text>
<Menu name="switch-profile">
<text>&amp;Switch Profile</text>
<ActionList name="profile-list"/>
</Menu>
</kpartgui>

@ -1,6 +1,6 @@
<!DOCTYPE kpartgui>
<kpartgui name="session" version="14">
<kpartgui name="session" version="15">
<MenuBar>
<Menu name="file">
<Action name="close-session" group="session-tab-operations"/>
@ -39,6 +39,7 @@
</Menu>
<Menu name="settings">
<Action name="edit-current-profile" group="session-settings"/>
<Action name="switch-profile" group="session-settings"/>
</Menu>
<!--<Menu name="debug"><text>Debug</text>
<Action name="debug-process"/>
@ -54,12 +55,12 @@
<Action name="configure-history"/>
<Separator/>
<Action name="show-menubar"/>
<Action name="change-profile"/>
<Action name="switch-profile"/>
<Action name="edit-current-profile"/>
<Separator/>
<Action name="close-session"/>
</Menu>
<Menu name="change-profile"><text>&amp;Change Profile</text>
<Menu name="switch-profile"><text>&amp;Switch Profile</text>
<ActionList name="profile-list"/>
</Menu>
</kpartgui>

@ -544,8 +544,8 @@ void SessionController::setupActions()
action->setText(i18n("Configure Current Profile..."));
action->setIcon(KIcon("document-properties") );
_changeProfileMenu = new KActionMenu(i18n("Change Profile"), _view);
collection->addAction("change-profile", _changeProfileMenu);
_changeProfileMenu = new KActionMenu(i18n("Switch Profile"), _view);
collection->addAction("switch-profile", _changeProfileMenu);
connect(_changeProfileMenu->menu(), SIGNAL(aboutToShow()), this, SLOT(prepareChangeProfileMenu()));
}

Loading…
Cancel
Save