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

List:       kde-commits
Subject:    KDE/kdebase/workspace/powerdevil/kcmodule/profiles
From:       Dario Freddi <drf () kde ! org>
Date:       2010-12-09 7:22:21
Message-ID: 20101209072221.D1F0AAC8AC () svn ! kde ! org
[Download RAW message or body]

SVN commit 1204814 by dafre:

BUG: 209679

Thanks to the new ID/Name separation, is now possible to edit name and icon of a \
profile

 M  +12 -7     EditPage.cpp  
 M  +1 -1      EditPage.h  
 M  +5 -0      profileEditPage.ui  


--- trunk/KDE/kdebase/workspace/powerdevil/kcmodule/profiles/EditPage.cpp \
#1204813:1204814 @@ -91,6 +91,7 @@
     listLayout->addWidget(m_toolBar);
 
     m_toolBar->addAction(actionNewProfile);
+    m_toolBar->addAction(actionEditProfile);
     m_toolBar->addAction(actionDeleteProfile);
     m_toolBar->addSeparator();
     m_toolBar->addAction(actionImportProfiles);
@@ -99,6 +100,7 @@
     m_toolBar->setToolButtonStyle(Qt::ToolButtonIconOnly);
 
     actionNewProfile->setIcon(KIcon("document-new"));
+    actionEditProfile->setIcon(KIcon("document-edit"));
     actionDeleteProfile->setIcon(KIcon("edit-delete-page"));
     actionImportProfiles->setIcon(KIcon("document-import"));
     actionExportProfiles->setIcon(KIcon("document-export"));
@@ -108,6 +110,7 @@
             SLOT(switchProfile(QListWidgetItem*, QListWidgetItem*)));
 
     connect(actionDeleteProfile, SIGNAL(triggered()), SLOT(deleteCurrentProfile()));
+    connect(actionEditProfile, SIGNAL(triggered(bool)), SLOT(editProfile()));
     connect(actionNewProfile, SIGNAL(triggered()), SLOT(createProfile()));
     connect(actionImportProfiles, SIGNAL(triggered()), SLOT(importProfiles()));
     connect(actionExportProfiles, SIGNAL(triggered()), SLOT(exportProfiles()));
@@ -393,27 +396,30 @@
     delete dialog;
 }
 
-void EditPage::editProfile(const QString &prevname, const QString &icon)
+void EditPage::editProfile(const QString &id, const QString &name, const QString \
&icon)  {
-    if (prevname.isEmpty())
+    if (id.isEmpty() || !m_profilesConfig->hasGroup(id)) {
         return;
+    }
 
-    KConfigGroup group(m_profilesConfig, prevname);
+    KConfigGroup group(m_profilesConfig, id);
 
     group.writeEntry("icon", icon);
+    group.writeEntry("name", name);
 
     group.sync();
 
     // Notify the daemon
-    notifyDaemon(prevname);
+    notifyDaemon(id);
 
     reloadAvailableProfiles();
 }
 
 void EditPage::editProfile()
 {
-    if (!profilesList->currentItem())
+    if (!profilesList->currentItem()) {
         return;
+    }
 
     KDialog *dialog = new KDialog(this);
     QWidget *wg = new QWidget();
@@ -431,7 +437,6 @@
 
     ed->setToolTip(i18n("The name for the new profile"));
     ed->setWhatsThis(i18n("Enter here the name for the profile you are creating"));
-    ed->setEnabled(false);
 
     KConfigGroup group(m_profilesConfig, \
profilesList->currentItem()->data(Qt::UserRole).toString());  
@@ -447,7 +452,7 @@
     ed->setFocus();
 
     if (dialog->exec() == KDialog::Accepted) {
-        editProfile(profilesList->currentItem()->data(Qt::UserRole).toString(), \
ibt->icon()); +        \
editProfile(profilesList->currentItem()->data(Qt::UserRole).toString(), ed->text(), \
ibt->icon());  }
 
     delete dialog;
--- trunk/KDE/kdebase/workspace/powerdevil/kcmodule/profiles/EditPage.h \
#1204813:1204814 @@ -49,7 +49,7 @@
     void switchProfile(QListWidgetItem *current, QListWidgetItem *previous);
     void reloadAvailableProfiles();
     void createProfile(const QString &name, const QString &icon);
-    void editProfile(const QString &prevname, const QString &icon);
+    void editProfile(const QString &id, const QString &name, const QString &icon);
     void deleteCurrentProfile();
     void createProfile();
     void editProfile();
--- trunk/KDE/kdebase/workspace/powerdevil/kcmodule/profiles/profileEditPage.ui \
#1204813:1204814 @@ -81,6 +81,11 @@
     <string>Restore Default Profiles</string>
    </property>
   </action>
+  <action name="actionEditProfile">
+   <property name="text">
+    <string>Edit Profile</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>


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