[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kicker/ui
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2005-01-30 23:56:57
Message-ID: 20050130235657.58B561BADD () office ! kde ! org
[Download RAW message or body]

CVS commit by aseigo: 

add shortcuts, less "button"s, bring in line with coding standards


  M +25 -19    addcontainer_mnu.cpp   1.24
  M +6 -3      addcontainer_mnu.h   1.13


--- kdebase/kicker/ui/addcontainer_mnu.h  #1.12:1.13
@@ -34,6 +34,6 @@ class AddContainerMenu : public QPopupMe
 
 public:
-    AddContainerMenu( ContainerArea* cArea, bool showExtensions,
-                      QWidget *parent=0, const char *name=0 );
+    AddContainerMenu(ContainerArea* cArea, bool showExtensions,
+                     QWidget *parent=0, const char *name=0);
     ~AddContainerMenu();
 
@@ -42,5 +42,8 @@ protected slots:
 
 private:
-    int appletId, extensionId, buttonId, specialId;
+    int m_appletId;
+    int m_extensionId;
+    int m_buttonId;
+    int m_specialId;
 };
 

--- kdebase/kicker/ui/addcontainer_mnu.cpp  #1.23:1.24
@@ -35,23 +35,29 @@ CONNECTION WITH THE SOFTWARE OR THE USE 
 #include "pluginmanager.h"
 
-AddContainerMenu::AddContainerMenu( ContainerArea* containerArea, bool showExtensions,
+AddContainerMenu::AddContainerMenu(ContainerArea* containerArea, bool showExtensions,
                                     QWidget *parent, const char *name)
-    : QPopupMenu( parent, name )
+    : QPopupMenu(parent, name),
+      m_appletId(-1),
+      m_buttonId(-1),
+      m_extensionId(-1),
+      m_specialId(-1)
 {
-    appletId = insertItem( i18n( "Applet" ),
-                           new PanelAddAppletMenu( containerArea, this ) );
-    buttonId = insertItem( i18n( "Application Button" ),
-                           new PanelAddButtonMenu( containerArea, this ) );
+    m_appletId = insertItem(i18n("&Applet"),
+                            new PanelAddAppletMenu(containerArea, this));
+    m_buttonId = insertItem(i18n("Appli&cation"),
+                            new PanelAddButtonMenu(containerArea, this));
 
-    if ( showExtensions )
-        extensionId = insertItem( i18n( "Panel" ),
-                                  new PanelAddExtensionMenu( this ) );
-    else
-        extensionId = -1;
+    if (showExtensions)
+    {
+        m_extensionId = insertItem(i18n("&Panel"),
+                                   new PanelAddExtensionMenu(this));
+    }
 
-    specialId = insertItem( i18n( "Special Button" ),
-                            new PanelAddSpecialButtonMenu( containerArea, this ) );
+    m_specialId = insertItem(i18n("&Special Button"),
+                             new PanelAddSpecialButtonMenu(containerArea,
+                                                           this));
     adjustSize();
-    connect( this, SIGNAL( aboutToShow() ), SLOT( slotAboutToShow() ) );
+
+    connect(this, SIGNAL(aboutToShow()), SLOT(slotAboutToShow()));
 }
 
@@ -63,6 +69,6 @@ AddContainerMenu::~AddContainerMenu()
 void AddContainerMenu::slotAboutToShow()
 {
-    setItemEnabled(appletId, PluginManager::applets().count() > 0);
-    setItemEnabled(extensionId, PluginManager::extensions().count() > 0);
+    setItemEnabled(m_appletId, PluginManager::applets().count() > 0);
+    setItemEnabled(m_extensionId, PluginManager::extensions().count() > 0);
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]