diff options
| author | william os4y <william.os4y@gmail.com> | 2015-02-26 18:15:28 +0100 |
|---|---|---|
| committer | william os4y <william.os4y@gmail.com> | 2015-02-26 18:15:28 +0100 |
| commit | aec1ead9ba72cbdedb859610b83f74fc2c8ecb34 (patch) | |
| tree | 2a6b916a99f06eda59ccb010ee5fed626bdd4506 /lumina-desktop/panel-plugins | |
| parent | fix issue #55: inform user whan return code is not null (diff) | |
| parent | Have lumina-search load the icons a moment after the application is done init... (diff) | |
| download | lumina-aec1ead9ba72cbdedb859610b83f74fc2c8ecb34.tar.gz lumina-aec1ead9ba72cbdedb859610b83f74fc2c8ecb34.tar.bz2 lumina-aec1ead9ba72cbdedb859610b83f74fc2c8ecb34.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'lumina-desktop/panel-plugins')
| -rw-r--r-- | lumina-desktop/panel-plugins/userbutton/UserWidget.cpp | 2 | ||||
| -rw-r--r-- | lumina-desktop/panel-plugins/userbutton/UserWidget.h | 3 | ||||
| -rw-r--r-- | lumina-desktop/panel-plugins/userbutton/UserWidget.ui | 22 |
3 files changed, 27 insertions, 0 deletions
diff --git a/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp b/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp index d5f8cd2e..6ca3ba19 100644 --- a/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp +++ b/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp @@ -32,12 +32,14 @@ UserWidget::UserWidget(QWidget* parent) : QTabWidget(parent), ui(new Ui::UserWid ui->tool_fav_files->setIcon( LXDG::findIcon("document-multiple","") ); ui->tool_desktopsettings->setIcon( LXDG::findIcon("preferences-desktop","") ); ui->tool_config_screensaver->setIcon( LXDG::findIcon("preferences-desktop-screensaver","") ); + ui->tool_config_screensettings->setIcon( LXDG::findIcon("preferences-other","") ); ui->tool_home_gohome->setIcon( LXDG::findIcon("go-home","") ); ui->tool_home_browse->setIcon( LXDG::findIcon("document-open","") ); ui->tool_config_about->setIcon( LXDG::findIcon("lumina","") ); //Connect the signals/slots connect(ui->tool_desktopsettings, SIGNAL(clicked()), this, SLOT(openDeskSettings()) ); connect(ui->tool_config_screensaver, SIGNAL(clicked()), this, SLOT(openScreenSaverConfig()) ); + connect(ui->tool_config_screensettings, SIGNAL(clicked()), this, SLOT(openScreenConfig()) ); connect(ui->tool_fav_apps, SIGNAL(clicked()), this, SLOT(FavChanged()) ); connect(ui->tool_fav_files, SIGNAL(clicked()), this, SLOT(FavChanged()) ); connect(ui->tool_fav_dirs, SIGNAL(clicked()), this, SLOT(FavChanged()) ); diff --git a/lumina-desktop/panel-plugins/userbutton/UserWidget.h b/lumina-desktop/panel-plugins/userbutton/UserWidget.h index 108f540f..c7af2a4d 100644 --- a/lumina-desktop/panel-plugins/userbutton/UserWidget.h +++ b/lumina-desktop/panel-plugins/userbutton/UserWidget.h @@ -80,6 +80,9 @@ private slots: void openScreenSaverConfig(){ LaunchItem(SSAVER, false); } + void openScreenConfig(){ + LaunchItem("lumina-xconfig",false); + } void openLuminaInfo(){ LaunchItem("lumina-info",false); } diff --git a/lumina-desktop/panel-plugins/userbutton/UserWidget.ui b/lumina-desktop/panel-plugins/userbutton/UserWidget.ui index 9a307cb6..f00daf08 100644 --- a/lumina-desktop/panel-plugins/userbutton/UserWidget.ui +++ b/lumina-desktop/panel-plugins/userbutton/UserWidget.ui @@ -481,6 +481,28 @@ </widget> </item> <item> + <widget class="QToolButton" name="tool_config_screensettings"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Screen Configuration</string> + </property> + <property name="iconSize"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + <property name="toolButtonStyle"> + <enum>Qt::ToolButtonTextBesideIcon</enum> + </property> + </widget> + </item> + <item> <widget class="QToolButton" name="tool_qtconfig"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> |