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

List:       kde-commits
Subject:    extragear/plasma/applets/lancelot/app/src/applet
From:       Ivan Čukić <ivan.cukic+kde () gmail ! com>
Date:       2008-02-06 8:18:15
Message-ID: 1202285895.094478.4968.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 771492 by ivan:

* configuration dialog for applet finished
* layout fixes

 M  +7 -1      LancelotApplet.cpp  
 M  +43 -0     LancelotAppletConfig.cpp  
 M  +7 -0      LancelotAppletConfig.h  


--- trunk/extragear/plasma/applets/lancelot/app/src/applet/LancelotApplet.cpp #771491:771492
@@ -252,7 +252,6 @@
         }
         distance += wpercent;
     }
-    
 }
 
 void LancelotApplet::applyConfig()
@@ -262,6 +261,8 @@
     } else {
         createMenuButton();
     }
+    emit geometryChanged();
+    layoutButtons();
 }
     
 void LancelotApplet::loadConfig()
@@ -298,6 +299,11 @@
         connect(m_configDialog, SIGNAL(applyClicked()), this, SLOT(configAccepted()));
         connect(m_configDialog, SIGNAL(okClicked()), this, SLOT(configAccepted()));
     }
+
+    m_configDialog->setShowCategories(m_showCategories);
+    m_configDialog->setIcon(m_mainIcon);
+    m_configDialog->setClickActivation(m_clickActivation);
+
     m_configDialog->show();
 }
 
--- trunk/extragear/plasma/applets/lancelot/app/src/applet/LancelotAppletConfig.cpp #771491:771492
@@ -11,6 +11,17 @@
     m_ui.iconKDE->setPixmap((new KIcon("kde"))->pixmap(48));
     m_ui.iconStartHere->setPixmap((new KIcon("start-here"))->pixmap(48));
     
+    qbgIcons.addButton(m_ui.radioShowCategories);
+    qbgIcons.addButton(m_ui.radioShowMenuIconOnly);
+    
+    qbgChooseIcon.addButton(m_ui.radioIconLancelot);
+    qbgChooseIcon.addButton(m_ui.radioIconKDE);
+    qbgChooseIcon.addButton(m_ui.radioIconStartHere);
+    qbgChooseIcon.addButton(m_ui.radioIconCustom);
+    
+    qbgMenuActivation.addButton(m_ui.radioActivationHover);
+    qbgMenuActivation.addButton(m_ui.radioActivationClick);
+    
     setMainWidget(widget);
     setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Apply);
 }
@@ -44,3 +55,35 @@
         return m_ui.iconCustom->icon();
     }
 }
+
+void LancelotAppletConfig::setShowCategories(bool value)
+{
+    if (value) {
+        m_ui.radioShowCategories->click();
+    } else {
+        m_ui.radioShowMenuIconOnly->click();
+    }
+}
+
+void LancelotAppletConfig::setClickActivation(bool value)
+{
+    if (value) {
+        m_ui.radioActivationClick->click();
+    } else {
+        m_ui.radioActivationHover->click();
+    }
+}
+
+void LancelotAppletConfig::setIcon(QString icon)
+{
+    if (icon == "lancelot") {
+        m_ui.radioIconLancelot->click();
+    } else if (icon == "kde") {
+        m_ui.radioIconKDE->click();
+    } else if (icon == "start-here") {
+        m_ui.radioIconStartHere->click();
+    } else {
+        m_ui.radioIconCustom->click();
+        m_ui.iconCustom->setIcon(icon);
+    }
+}
--- trunk/extragear/plasma/applets/lancelot/app/src/applet/LancelotAppletConfig.h #771491:771492
@@ -12,8 +12,15 @@
 	bool clickActivation() const;
 	QString icon() const;
 	
+    void setShowCategories(bool value);
+    void setClickActivation(bool value);
+    void setIcon(QString icon);
+    
 private:
     Ui::LancelotAppletConfigBase m_ui;
+    QButtonGroup qbgIcons;
+    QButtonGroup qbgChooseIcon;
+    QButtonGroup qbgMenuActivation;
 };
 
 #endif /*LANCELOTAPPLETCONFIG_H_*/
[prev in list] [next in list] [prev in thread] [next in thread]