yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

s/group window/window tab/ where it makes sense to reduce possible

Browse source 
confusion.

svn path=/trunk/KDE/kdebase/workspace/; revision=1050318
This commit is contained in:
Lucas Murray 2009-11-17 08:46:20 +00:00
parent 3855b9253b
commit 0b153f8861
4 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
kcmkwin/kwinoptions/mouse.cpp
View file

@ -184,7 +184,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
comboW->addItem(i18n("Keep Above/Below"));
comboW->addItem(i18n("Move to Previous/Next Desktop"));
comboW->addItem(i18n("Change Opacity"));
comboW->addItem(i18n("Switch to Group Window to the Left/Right"));
comboW->addItem(i18n("Switch to Window Tab to the Left/Right"));
comboW->addItem(i18n("Nothing"));
comboW->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
connect(comboW, SIGNAL(activated(int)), SLOT(changed()));
@ -481,7 +481,7 @@ const char* tbl_TiWAc[] = {
"Above/Below",
"Previous/Next Desktop",
"Change Opacity",
"Switch to Group Window to the Left/Right",
"Switch to Window Tab to the Left/Right",
"Nothing",
"" };
@ -492,7 +492,7 @@ const char* tbl_AllW[] = {
"Above/Below",
"Previous/Next Desktop",
"Change Opacity",
"Switch to Group Window to the Left/Right",
"Switch to Window Tab to the Left/Right",
"Nothing",
"" };
@ -578,7 +578,7 @@ void KTitleBarActionsConfig::load()
setComboText(coTiAct1,cg.readEntry("CommandActiveTitlebar1","Raise").toAscii());
setComboText(coTiAct2,cg.readEntry("CommandActiveTitlebar2","Start Window Tab Drag").toAscii());
setComboText(coTiAct3,cg.readEntry("CommandActiveTitlebar3","Operations menu").toAscii());
setComboText(coTiAct4,cg.readEntry("CommandTitlebarWheel","Switch to Group Window to the Left/Right").toAscii());
setComboText(coTiAct4,cg.readEntry("CommandTitlebarWheel","Switch to Window Tab to the Left/Right").toAscii());
setComboText(coTiInAct1,cg.readEntry("CommandInactiveTitlebar1","Activate and raise").toAscii());
setComboText(coTiInAct2,cg.readEntry("CommandInactiveTitlebar2","Start Window Tab Drag").toAscii());
setComboText(coTiInAct3,cg.readEntry("CommandInactiveTitlebar3","Operations menu").toAscii());
@ -617,7 +617,7 @@ void KTitleBarActionsConfig::defaults()
setComboText(coTiAct1,"Raise");
setComboText(coTiAct2,"Start Window Tab Drag");
setComboText(coTiAct3,"Operations menu");
setComboText(coTiAct4,"Switch to Group Window to the Left/Right");
setComboText(coTiAct4,"Switch to Window Tab to the Left/Right");
setComboText(coTiInAct1,"Activate and raise");
setComboText(coTiInAct2,"Start Window Tab Drag");
setComboText(coTiInAct3,"Operations menu");
@ -850,7 +850,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
combo->addItem(i18n("Keep Above/Below"));
combo->addItem(i18n("Move to Previous/Next Desktop"));
combo->addItem(i18n("Change Opacity"));
combo->addItem(i18n("Switch to Group Window to the Left/Right"));
combo->addItem(i18n("Switch to Window Tab to the Left/Right"));
combo->addItem(i18n("Nothing"));
connect(combo, SIGNAL(activated(int)), SLOT(changed()));
coAllW = combo;

4
kwinbindings.cpp
View file

@ -54,8 +54,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
a->setText( i18n("Navigation") );
DEF( I18N_NOOP("Walk Through Windows"), Qt::ALT+Qt::Key_Tab, slotWalkThroughWindows() );
DEF( I18N_NOOP("Walk Through Windows (Reverse)"), Qt::ALT+Qt::SHIFT+Qt::Key_Backtab, slotWalkBackThroughWindows() );
DEF( I18N_NOOP("Walk Through Grouped Windows"), 0, slotSwitchToTabRight() );
DEF( I18N_NOOP("Walk Through Grouped Windows (Reverse)"), 0, slotSwitchToTabLeft() );
DEF( I18N_NOOP("Walk Through Window Tabs"), 0, slotSwitchToTabRight() );
DEF( I18N_NOOP("Walk Through Window Tabs (Reverse)"), 0, slotSwitchToTabLeft() );
DEF( I18N_NOOP("Remove Window From Group"), 0, slotRemoveFromGroup() );
DEF( I18N_NOOP("Walk Through Windows Alternative"), 0, slotWalkThroughWindowsAlternative() );
DEF( I18N_NOOP("Walk Through Windows Alternative (Reverse)"), 0, slotWalkBackThroughWindowsAlternative() );

7
options.cpp
View file

@ -183,7 +183,7 @@ unsigned long Options::updateSettings()
CmdInactiveTitlebar1 = mouseCommand(config.readEntry("CommandInactiveTitlebar1","Activate and raise"), true );
CmdInactiveTitlebar2 = mouseCommand(config.readEntry("CommandInactiveTitlebar2","Start Window Tab Drag"), true );
CmdInactiveTitlebar3 = mouseCommand(config.readEntry("CommandInactiveTitlebar3","Operations menu"), true );
CmdTitlebarWheel = mouseWheelCommand(config.readEntry("CommandTitlebarWheel","Switch to Group Window to the Left/Right"));
CmdTitlebarWheel = mouseWheelCommand(config.readEntry("CommandTitlebarWheel","Switch to Window Tab to the Left/Right"));
CmdWindow1 = mouseCommand(config.readEntry("CommandWindow1","Activate, raise and pass click"), false );
CmdWindow2 = mouseCommand(config.readEntry("CommandWindow2","Activate and pass click"), false );
CmdWindow3 = mouseCommand(config.readEntry("CommandWindow3","Activate and pass click"), false );
@ -343,8 +343,9 @@ Options::MouseWheelCommand Options::mouseWheelCommand(const QString &name)
if (lowerName == "above/below") return MouseWheelAboveBelow;
if (lowerName == "previous/next desktop") return MouseWheelPreviousNextDesktop;
if (lowerName == "change opacity") return MouseWheelChangeOpacity;
if (lowerName == "switch to group window to the left/right") return MouseWheelChangeGroupWindow;
return MouseWheelNothing;
if (lowerName == "switch to window tab to the left/right") return MouseWheelChangeGroupWindow;
if (lowerName == "nothing") return MouseWheelNothing;
return MouseWheelChangeGroupWindow;
}
bool Options::showGeometryTip()

6
useractions.cpp
View file

@ -304,7 +304,7 @@ void Workspace::initSwitchToTab()
QAction* action = switch_to_tab_popup->menuAction();
popup->insertAction( mRemoveTabGroup, action );
action->setText( i18n("Switch to group window") );
action->setText( i18n("Switch to window tab") );
}
void Workspace::slotSwitchToTab( QAction* action )
@ -533,7 +533,7 @@ void Workspace::readShortcuts()
connect( kaction, SIGNAL(globalShortcutChanged(QKeySequence)), this, SLOT(slotWalkBackThroughWindowsKeyChanged(QKeySequence)));
}
kaction = qobject_cast<KAction*>( keys->action("Walk Through Group Windows") );
kaction = qobject_cast<KAction*>( keys->action("Walk Through Window Tabs") );
if( kaction != 0 )
{
cutWalkThroughGroupWindows = kaction->globalShortcut();
@ -541,7 +541,7 @@ void Workspace::readShortcuts()
SLOT( slotMoveToTabRightKeyChanged( QKeySequence ) ) );
}
kaction = qobject_cast<KAction*>( keys->action("Walk Through Group Windows (Reverse)") );
kaction = qobject_cast<KAction*>( keys->action("Walk Through Window Tabs (Reverse)") );
if( kaction != 0 )
{
cutWalkThroughGroupWindowsReverse = kaction->globalShortcut();