diff options
Diffstat (limited to 'lumina-desktop')
4 files changed, 77 insertions, 48 deletions
diff --git a/lumina-desktop/desktop-plugins/desktopview/DesktopViewPlugin.cpp b/lumina-desktop/desktop-plugins/desktopview/DesktopViewPlugin.cpp index be815587..527de682 100644 --- a/lumina-desktop/desktop-plugins/desktopview/DesktopViewPlugin.cpp +++ b/lumina-desktop/desktop-plugins/desktopview/DesktopViewPlugin.cpp @@ -174,9 +174,6 @@ void DesktopViewPlugin::updateContents(){ void DesktopViewPlugin::displayProperties(){ QList<QListWidgetItem*> sel = list->selectedItems(); for(int i=0; i<sel.length(); i++){ - //lumina-fileinfo only works on *.desktop files at the moment - if(sel[i]->whatsThis().endsWith(".desktop")){ - LSession::LaunchApplication("lumina-fileinfo \""+sel[i]->whatsThis()); - } + LSession::LaunchApplication("lumina-fileinfo \""+sel[i]->whatsThis()); } } diff --git a/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp b/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp index 404fcc26..9c002109 100644 --- a/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp +++ b/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp @@ -35,6 +35,7 @@ UserWidget::UserWidget(QWidget* parent) : QTabWidget(parent), ui(new Ui::UserWid 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_home_search->setIcon( LXDG::findIcon("system-search","") ); ui->tool_config_about->setIcon( LXDG::findIcon("lumina","") ); //Connect the signals/slots connect(ui->tool_desktopsettings, SIGNAL(clicked()), this, SLOT(openDeskSettings()) ); @@ -46,6 +47,7 @@ UserWidget::UserWidget(QWidget* parent) : QTabWidget(parent), ui(new Ui::UserWid connect(ui->combo_app_cats, SIGNAL(currentIndexChanged(int)), this, SLOT(updateApps()) ); connect(ui->tool_home_gohome, SIGNAL(clicked()), this, SLOT(slotGoHome()) ); connect(ui->tool_home_browse, SIGNAL(clicked()), this, SLOT(slotOpenDir()) ); + connect(ui->tool_home_search, SIGNAL(clicked()), this, SLOT(slotOpenSearch()) ); connect(ui->tool_config_about, SIGNAL(clicked()), this, SLOT(openLuminaInfo()) ); //Setup the special buttons @@ -297,7 +299,7 @@ void UserWidget::slotGoToDir(QString dir){ ui->label_home_dir->setWhatsThis(dir); updateHome(); } - + void UserWidget::slotGoHome(){ slotGoToDir(QDir::homePath()); } @@ -305,7 +307,11 @@ void UserWidget::slotGoHome(){ void UserWidget::slotOpenDir(){ LaunchItem(ui->label_home_dir->whatsThis()); } - + +void UserWidget::slotOpenSearch(){ + LaunchItem("lumina-search -dir \""+ui->label_home_dir->whatsThis()+"\"", false); //use command as-is +} + void UserWidget::mouseMoveEvent( QMouseEvent *event){ QTabBar *wid = tabBar(); if(wid==0){ return; } //invalid widget found diff --git a/lumina-desktop/panel-plugins/userbutton/UserWidget.h b/lumina-desktop/panel-plugins/userbutton/UserWidget.h index 8f5ba852..2dce25b4 100644 --- a/lumina-desktop/panel-plugins/userbutton/UserWidget.h +++ b/lumina-desktop/panel-plugins/userbutton/UserWidget.h @@ -65,6 +65,7 @@ private slots: void slotGoToDir(QString dir); void slotGoHome(); void slotOpenDir(); + void slotOpenSearch(); //Slots for the special buttons void openStore(){ diff --git a/lumina-desktop/panel-plugins/userbutton/UserWidget.ui b/lumina-desktop/panel-plugins/userbutton/UserWidget.ui index f00daf08..bce684fd 100644 --- a/lumina-desktop/panel-plugins/userbutton/UserWidget.ui +++ b/lumina-desktop/panel-plugins/userbutton/UserWidget.ui @@ -17,7 +17,7 @@ <enum>QTabWidget::West</enum> </property> <property name="currentIndex"> - <number>3</number> + <number>2</number> </property> <widget class="QWidget" name="tab_fav"> <attribute name="title"> @@ -170,8 +170,8 @@ <rect> <x>0</x> <y>0</y> - <width>98</width> - <height>28</height> + <width>260</width> + <height>247</height> </rect> </property> </widget> @@ -276,8 +276,8 @@ <rect> <x>0</x> <y>0</y> - <width>98</width> - <height>28</height> + <width>260</width> + <height>247</height> </rect> </property> </widget> @@ -309,11 +309,61 @@ <number>1</number> </property> <item> - <layout class="QHBoxLayout" name="horizontalLayout_3"> - <property name="spacing"> + <layout class="QGridLayout" name="gridLayout"> + <property name="horizontalSpacing"> + <number>4</number> + </property> + <property name="verticalSpacing"> <number>1</number> </property> - <item> + <item row="0" column="3"> + <widget class="QToolButton" name="tool_home_search"> + <property name="toolTip"> + <string>Search this Directory</string> + </property> + <property name="text"> + <string notr="true"/> + </property> + <property name="iconSize"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QToolButton" name="tool_home_browse"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>30</width> + <height>30</height> + </size> + </property> + <property name="toolTip"> + <string>Open Directory</string> + </property> + <property name="text"> + <string notr="true">Browse</string> + </property> + <property name="iconSize"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + <property name="toolButtonStyle"> + <enum>Qt::ToolButtonIconOnly</enum> + </property> + </widget> + </item> + <item row="0" column="0"> <widget class="QToolButton" name="tool_home_gohome"> <property name="minimumSize"> <size> @@ -338,8 +388,14 @@ </property> </widget> </item> - <item> + <item row="0" column="1"> <widget class="QLabel" name="label_home_dir"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="minimumSize"> <size> <width>0</width> @@ -376,37 +432,6 @@ </property> </widget> </item> - <item> - <widget class="QToolButton" name="tool_home_browse"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>90</width> - <height>30</height> - </size> - </property> - <property name="toolTip"> - <string>Open Directory</string> - </property> - <property name="text"> - <string notr="true">Browse</string> - </property> - <property name="iconSize"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - <property name="toolButtonStyle"> - <enum>Qt::ToolButtonTextBesideIcon</enum> - </property> - </widget> - </item> </layout> </item> <item> @@ -419,8 +444,8 @@ <rect> <x>0</x> <y>0</y> - <width>98</width> - <height>28</height> + <width>260</width> + <height>247</height> </rect> </property> </widget> |