[PC-BSD Commits] r7619 - in pcbsd/current/src-qt4: life-preserver pc-controlpanel pc-controlpanel/images
svn at pcbsd.org
svn at pcbsd.org
Wed Sep 22 09:26:12 PDT 2010
Author: kris
Date: 2010-09-22 09:26:12 -0700 (Wed, 22 Sep 2010)
New Revision: 7619
Added:
pcbsd/current/src-qt4/pc-controlpanel/images/lifepreserver.png
Modified:
pcbsd/current/src-qt4/life-preserver/life-preserver.pro
pcbsd/current/src-qt4/pc-controlpanel/pc-controlpanel.cpp
pcbsd/current/src-qt4/pc-controlpanel/pc-controlpanel.h
pcbsd/current/src-qt4/pc-controlpanel/pc-controlpanel.qrc
pcbsd/current/src-qt4/pc-controlpanel/pc-controlpanel.ui
Log:
Added life-preserver to pc-controlpanel, and disable life-preserver stand-alone icon
Modified: pcbsd/current/src-qt4/life-preserver/life-preserver.pro
===================================================================
--- pcbsd/current/src-qt4/life-preserver/life-preserver.pro 2010-09-22 16:15:42 UTC (rev 7618)
+++ pcbsd/current/src-qt4/life-preserver/life-preserver.pro 2010-09-22 16:26:12 UTC (rev 7619)
@@ -60,7 +60,7 @@
dotrans.path=/usr/local/share/lifePreserver/i18n/
dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/lifePreserver/i18n/
-INSTALLS += scripts conf dotrans images desktop desktopperm
+INSTALLS += scripts conf dotrans images desktopperm
TRANSLATIONS = i18n/LifePreserver_af.ts \
i18n/LifePreserver_ar.ts \
Property changes on: pcbsd/current/src-qt4/pc-controlpanel/images/lifepreserver.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: pcbsd/current/src-qt4/pc-controlpanel/pc-controlpanel.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-controlpanel/pc-controlpanel.cpp 2010-09-22 16:15:42 UTC (rev 7618)
+++ pcbsd/current/src-qt4/pc-controlpanel/pc-controlpanel.cpp 2010-09-22 16:26:12 UTC (rev 7619)
@@ -44,6 +44,7 @@
connect(pushSystem, SIGNAL(clicked()), this, SLOT(slotSystemClicked()));
connect(pushServices, SIGNAL(clicked()), this, SLOT(slotServicesClicked()));
connect(pushUsers, SIGNAL(clicked()), this, SLOT(slotUsersClicked()));
+ connect(pushLife, SIGNAL(clicked()), this, SLOT(slotLifeClicked()));
@@ -79,6 +80,11 @@
runProg("pc-usermanager");
}
+void PCC::slotLifeClicked()
+{
+ runProg("life-preserver");
+}
+
void PCC::runProg(QString prog)
{
ExeProc = new QProcess();
Modified: pcbsd/current/src-qt4/pc-controlpanel/pc-controlpanel.h
===================================================================
--- pcbsd/current/src-qt4/pc-controlpanel/pc-controlpanel.h 2010-09-22 16:15:42 UTC (rev 7618)
+++ pcbsd/current/src-qt4/pc-controlpanel/pc-controlpanel.h 2010-09-22 16:26:12 UTC (rev 7619)
@@ -34,6 +34,7 @@
void slotSystemClicked();
void slotServicesClicked();
void slotUsersClicked();
+ void slotLifeClicked();
private:
void runProg(QString prog);
Modified: pcbsd/current/src-qt4/pc-controlpanel/pc-controlpanel.qrc
===================================================================
--- pcbsd/current/src-qt4/pc-controlpanel/pc-controlpanel.qrc 2010-09-22 16:15:42 UTC (rev 7618)
+++ pcbsd/current/src-qt4/pc-controlpanel/pc-controlpanel.qrc 2010-09-22 16:26:12 UTC (rev 7619)
@@ -1,5 +1,6 @@
<RCC>
<qresource>
+ <file>images/lifepreserver.png</file>
<file>images/preferences-desktop-user-password.png</file>
<file>images/preferences-system-session-services.png</file>
<file>images/system.png</file>
Modified: pcbsd/current/src-qt4/pc-controlpanel/pc-controlpanel.ui
===================================================================
--- pcbsd/current/src-qt4/pc-controlpanel/pc-controlpanel.ui 2010-09-22 16:15:42 UTC (rev 7618)
+++ pcbsd/current/src-qt4/pc-controlpanel/pc-controlpanel.ui 2010-09-22 16:26:12 UTC (rev 7619)
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>588</width>
- <height>338</height>
+ <width>662</width>
+ <height>450</height>
</rect>
</property>
<property name="windowTitle">
@@ -34,8 +34,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>572</width>
- <height>298</height>
+ <width>631</width>
+ <height>393</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_5">
@@ -48,8 +48,11 @@
<item row="0" column="0">
<widget class="QPushButton" name="pushSoftware">
<property name="toolTip">
- <string extracomment="Manage your installed applications and system updates."/>
+ <string>Manage your installed applications and system updates.</string>
</property>
+ <property name="statusTip">
+ <string>Manage your installed applications and system updates.</string>
+ </property>
<property name="text">
<string>Software and Updates</string>
</property>
@@ -106,8 +109,11 @@
<item row="0" column="1">
<widget class="QPushButton" name="pushFirewall">
<property name="toolTip">
- <string extracomment="Adjust your local firewall settings."/>
+ <string>Adjust your local firewall settings.</string>
</property>
+ <property name="statusTip">
+ <string>Adjust your local firewall settings.</string>
+ </property>
<property name="text">
<string>Firewall</string>
</property>
@@ -142,8 +148,11 @@
<item row="0" column="2">
<widget class="QPushButton" name="pushNetwork">
<property name="toolTip">
- <string extracomment="Adjust your computers networking settings."/>
+ <string>Adjust your computers networking settings.</string>
</property>
+ <property name="statusTip">
+ <string>Adjust your computers networking settings.</string>
+ </property>
<property name="text">
<string>Networking</string>
</property>
@@ -181,8 +190,11 @@
<item row="0" column="0">
<widget class="QPushButton" name="pushSystem">
<property name="toolTip">
- <string extracomment="System tools and diagnostics"/>
+ <string>System tools and diagnostics</string>
</property>
+ <property name="statusTip">
+ <string>System tools and diagnostics</string>
+ </property>
<property name="text">
<string>System</string>
</property>
@@ -204,8 +216,11 @@
<item row="0" column="1">
<widget class="QPushButton" name="pushServices">
<property name="toolTip">
- <string extracomment="Manage your systems services."/>
+ <string>Manage your systems services.</string>
</property>
+ <property name="statusTip">
+ <string>Manage your systems services.</string>
+ </property>
<property name="text">
<string>Services</string>
</property>
@@ -227,8 +242,11 @@
<item row="0" column="2">
<widget class="QPushButton" name="pushUsers">
<property name="toolTip">
- <string extracomment="Add / Remove and edit users on this system."/>
+ <string>Add / Remove and edit users on this system.</string>
</property>
+ <property name="statusTip">
+ <string>Add / Remove and edit users on this system.</string>
+ </property>
<property name="text">
<string>Users</string>
</property>
@@ -263,6 +281,61 @@
</layout>
</widget>
</item>
+ <item row="5" column="0">
+ <widget class="Line" name="line_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0">
+ <widget class="QGroupBox" name="groupUtilities">
+ <property name="title">
+ <string>Utilities</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_6">
+ <item row="0" column="0">
+ <widget class="QPushButton" name="pushLife">
+ <property name="toolTip">
+ <string>Preserve your files to a remote location for safe-keeping.</string>
+ </property>
+ <property name="statusTip">
+ <string>Preserve your files to a remote location for safe-keeping.</string>
+ </property>
+ <property name="text">
+ <string>Life Preserver</string>
+ </property>
+ <property name="icon">
+ <iconset resource="pc-controlpanel.qrc">
+ <normaloff>:/images/lifepreserver.png</normaloff>:/images/lifepreserver.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>42</width>
+ <height>42</height>
+ </size>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
</layout>
</widget>
</widget>
@@ -274,7 +347,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>588</width>
+ <width>662</width>
<height>24</height>
</rect>
</property>
@@ -286,6 +359,7 @@
</widget>
<addaction name="menuFile"/>
</widget>
+ <widget class="QStatusBar" name="statusBar"/>
<action name="action_Quit">
<property name="text">
<string>&Quit</string>
More information about the Commits
mailing list