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

Merging from old trunk:

Browse source 
r655709 | binner | 2007-04-19 07:39:44 +0200 (Thu, 19 Apr 2007) | 2 lines

SVN_SILENT i18n style guide fixes


svn path=/trunk/KDE/kdebase/workspace/; revision=659588
This commit is contained in:
Luboš Luňák 2007-04-30 12:50:10 +00:00
parent e784cd89b1
commit 754d9f9589
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
useractions.cpp
View file

@ -109,8 +109,6 @@ QMenu* Workspace::clientPopup()
action = popup->addMenu( advanced_popup );
action->setText( i18n("Ad&vanced") );
desk_popup_index = popup->actions().count();
if (options->useTranslucency){
trans_popup = new QMenu( popup );
trans_popup->setFont(KGlobalSettings::menuFont());
@ -249,9 +247,9 @@ void Workspace::initDesktopPopup()
connect( desk_popup, SIGNAL( aboutToShow() ),
this, SLOT( desktopPopupAboutToShow() ) );
QAction *action = popup->addMenu( desk_popup );
QAction *action = desk_popup->menuAction();
popup->insertAction(mMoveOpAction, action);
action->setText( i18n("To &Desktop") );
action->setData( desk_popup_index );
}
/*!

1
workspace.cpp
View file

@ -101,7 +101,6 @@ Workspace::Workspace( bool restore )
advanced_popup (0),
trans_popup (0),
desk_popup (0),
desk_popup_index (0),
keys (0),
client_keys ( NULL ),
// client_keys_dialog ( NULL ),

1
workspace.h
View file

@ -623,7 +623,6 @@ class Workspace : public QObject, public KDecorationDefines
QMenu *advanced_popup;
QMenu *trans_popup;
QMenu *desk_popup;
int desk_popup_index;
void modalActionsSwitch( bool enabled );