aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/desktop-utils
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2017-04-13 13:16:50 -0400
committerKen Moore <ken@ixsystems.com>2017-04-13 13:16:50 -0400
commit967f3603f306d1ce0ea623a9c1df4d7677dd8a54 (patch)
treeb37e0f74174a6f4d17425413c68b9e194cb222af /src-qt5/desktop-utils
parentClean up which icons are used within lumina-fm. (diff)
downloadlumina-967f3603f306d1ce0ea623a9c1df4d7677dd8a54.tar.gz
lumina-967f3603f306d1ce0ea623a9c1df4d7677dd8a54.tar.bz2
lumina-967f3603f306d1ce0ea623a9c1df4d7677dd8a54.zip
Another few icon changes
Diffstat (limited to 'src-qt5/desktop-utils')
-rw-r--r--src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp2
-rw-r--r--src-qt5/desktop-utils/lumina-mediaplayer/mainUI.ui72
-rw-r--r--src-qt5/desktop-utils/lumina-pdf/mainUI.h5
3 files changed, 72 insertions, 7 deletions
diff --git a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp
index 062a4600..ac038126 100644
--- a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp
@@ -241,7 +241,7 @@ void DirWidget::createMenus(){
cOpenMenu->setTitle(tr("Launch..."));
cOpenMenu->setIcon( LXDG::findIcon("quickopen","") );
cOpenMenu->addAction(LXDG::findIcon("utilities-terminal",""), tr("Terminal"), this, SLOT(openTerminal()), kOpTerm->key());
- cOpenMenu->addAction(LXDG::findIcon("view-preview",""), tr("SlideShow"), this, SLOT(openInSlideshow()), kOpSS->key());
+ cOpenMenu->addAction(LXDG::findIcon("media-slideshow",""), tr("SlideShow"), this, SLOT(openInSlideshow()), kOpSS->key());
cOpenMenu->addAction(LXDG::findIcon("media-playback-start-circled","media-playback-start"), tr("Multimedia Player"), this, SLOT(openMultimedia()), kOpMM->key());
/*
if(cFModMenu==0){ cFModMenu = new QMenu(this); }
diff --git a/src-qt5/desktop-utils/lumina-mediaplayer/mainUI.ui b/src-qt5/desktop-utils/lumina-mediaplayer/mainUI.ui
index 5c42ab45..0b567aae 100644
--- a/src-qt5/desktop-utils/lumina-mediaplayer/mainUI.ui
+++ b/src-qt5/desktop-utils/lumina-mediaplayer/mainUI.ui
@@ -50,6 +50,9 @@
<property name="checked">
<bool>false</bool>
</property>
+ <property name="toolButtonStyle">
+ <enum>Qt::ToolButtonTextBesideIcon</enum>
+ </property>
<property name="autoRaise">
<bool>true</bool>
</property>
@@ -94,6 +97,73 @@
<attribute name="title">
<string>Now Playing</string>
</attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_7">
+ <item>
+ <layout class="QHBoxLayout" name="videoLayout_2">
+ <item>
+ <widget class="QLabel" name="label_player_novideo_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>13</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">background: black; color: white;</string>
+ </property>
+ <property name="text">
+ <string>(No Running Video)</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="videoControlLayout_2">
+ <item>
+ <widget class="QToolButton" name="toolButton">
+ <property name="text">
+ <string>...</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="toolButton_2">
+ <property name="text">
+ <string>...</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_player_runstats_2">
+ <property name="text">
+ <string notr="true">?/?</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSlider" name="playerSlider_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ <zorder>label_player_novideo</zorder>
+ <zorder>layoutWidget</zorder>
+ <zorder>layoutWidget_2</zorder>
</widget>
<widget class="QWidget" name="tab_local_playlist">
<attribute name="title">
@@ -498,7 +568,7 @@
<x>0</x>
<y>0</y>
<width>385</width>
- <height>19</height>
+ <height>20</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
diff --git a/src-qt5/desktop-utils/lumina-pdf/mainUI.h b/src-qt5/desktop-utils/lumina-pdf/mainUI.h
index 7198b3c3..1bd1699b 100644
--- a/src-qt5/desktop-utils/lumina-pdf/mainUI.h
+++ b/src-qt5/desktop-utils/lumina-pdf/mainUI.h
@@ -43,15 +43,10 @@ private:
private slots:
- //void startPainting(QPrinter *PRINTER);
void paintOnWidget(QPrinter *PRINTER);
- //void paintPage(QPrinter *PRINTER, QImage img, bool newpage);
//Button Slots
void OpenNewFile();
-signals:
- //void pageLoaded(QPrinter*, QImage, bool);
-
};
#endif
bgstack15