[PC-BSD Commits] r7756 - in pcbsd/current/src-qt4: . pc-controlpanel pc-controlpanel/images pc-cupscfg
svn at pcbsd.org
svn at pcbsd.org
Fri Oct 8 22:10:16 PDT 2010
Author: kris
Date: 2010-10-08 22:10:16 -0700 (Fri, 08 Oct 2010)
New Revision: 7756
Added:
pcbsd/current/src-qt4/pc-controlpanel/images/printer.png
pcbsd/current/src-qt4/pc-cupscfg/
pcbsd/current/src-qt4/pc-cupscfg/pc-cupscfg
pcbsd/current/src-qt4/pc-cupscfg/pc-cupscfg.pro
Modified:
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
pcbsd/current/src-qt4/src-qt4.pro
Log:
Added pc-cupscfg, which starts browser on cups web interface, link this into pc-controlpanel
as well
Property changes on: pcbsd/current/src-qt4/pc-controlpanel/images/printer.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-10-09 04:29:17 UTC (rev 7755)
+++ pcbsd/current/src-qt4/pc-controlpanel/pc-controlpanel.cpp 2010-10-09 05:10:16 UTC (rev 7756)
@@ -45,9 +45,8 @@
connect(pushServices, SIGNAL(clicked()), this, SLOT(slotServicesClicked()));
connect(pushUsers, SIGNAL(clicked()), this, SLOT(slotUsersClicked()));
connect(pushLife, SIGNAL(clicked()), this, SLOT(slotLifeClicked()));
+ connect(pushPrint, SIGNAL(clicked()), this, SLOT(slotPrintClicked()));
-
-
}
void PCC::slotSoftwareClicked()
@@ -85,6 +84,14 @@
runProg("life-preserver");
}
+void PCC::slotPrintClicked()
+{
+ QString user;
+ user = QString::fromLocal8Bit(getenv("LOGNAME"));
+ qDebug() << "Starting pc-cupscfg " + user;
+ runProg("pc-cupscfg " + user);
+}
+
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-10-09 04:29:17 UTC (rev 7755)
+++ pcbsd/current/src-qt4/pc-controlpanel/pc-controlpanel.h 2010-10-09 05:10:16 UTC (rev 7756)
@@ -27,14 +27,15 @@
private slots:
// Button Slots
- void slotQuitClicked();
- void slotSoftwareClicked();
void slotFirewallClicked();
+ void slotLifeClicked();
void slotNetworkClicked();
+ void slotPrintClicked();
+ void slotServicesClicked();
+ void slotSoftwareClicked();
void slotSystemClicked();
- void slotServicesClicked();
void slotUsersClicked();
- void slotLifeClicked();
+ void slotQuitClicked();
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-10-09 04:29:17 UTC (rev 7755)
+++ pcbsd/current/src-qt4/pc-controlpanel/pc-controlpanel.qrc 2010-10-09 05:10:16 UTC (rev 7756)
@@ -1,5 +1,6 @@
<RCC>
<qresource>
+ <file>images/printer.png</file>
<file>images/lifepreserver.png</file>
<file>images/preferences-desktop-user-password.png</file>
<file>images/preferences-system-session-services.png</file>
Modified: pcbsd/current/src-qt4/pc-controlpanel/pc-controlpanel.ui
===================================================================
--- pcbsd/current/src-qt4/pc-controlpanel/pc-controlpanel.ui 2010-10-09 04:29:17 UTC (rev 7755)
+++ pcbsd/current/src-qt4/pc-controlpanel/pc-controlpanel.ui 2010-10-09 05:10:16 UTC (rev 7756)
@@ -47,9 +47,6 @@
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QPushButton" name="pushSoftware">
- <property name="toolTip">
- <string>Manage your installed applications and system updates.</string>
- </property>
<property name="statusTip">
<string>Manage your installed applications and system updates.</string>
</property>
@@ -108,9 +105,6 @@
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="1">
<widget class="QPushButton" name="pushFirewall">
- <property name="toolTip">
- <string>Adjust your local firewall settings.</string>
- </property>
<property name="statusTip">
<string>Adjust your local firewall settings.</string>
</property>
@@ -147,9 +141,6 @@
</item>
<item row="0" column="2">
<widget class="QPushButton" name="pushNetwork">
- <property name="toolTip">
- <string>Adjust your computers networking settings.</string>
- </property>
<property name="statusTip">
<string>Adjust your computers networking settings.</string>
</property>
@@ -187,20 +178,17 @@
<string>Administration</string>
</property>
<layout class="QGridLayout" name="gridLayout_4">
- <item row="0" column="0">
- <widget class="QPushButton" name="pushSystem">
- <property name="toolTip">
- <string>System tools and diagnostics</string>
- </property>
+ <item row="0" column="2">
+ <widget class="QPushButton" name="pushServices">
<property name="statusTip">
- <string>System tools and diagnostics</string>
+ <string>Manage your systems services.</string>
</property>
<property name="text">
- <string>System</string>
+ <string>Services</string>
</property>
<property name="icon">
<iconset resource="pc-controlpanel.qrc">
- <normaloff>:/images/system.png</normaloff>:/images/system.png</iconset>
+ <normaloff>:/images/preferences-system-session-services.png</normaloff>:/images/preferences-system-session-services.png</iconset>
</property>
<property name="iconSize">
<size>
@@ -213,20 +201,17 @@
</property>
</widget>
</item>
- <item row="0" column="1">
- <widget class="QPushButton" name="pushServices">
- <property name="toolTip">
- <string>Manage your systems services.</string>
- </property>
+ <item row="0" column="4">
+ <widget class="QPushButton" name="pushUsers">
<property name="statusTip">
- <string>Manage your systems services.</string>
+ <string>Add / Remove and edit users on this system.</string>
</property>
<property name="text">
- <string>Services</string>
+ <string>Users</string>
</property>
<property name="icon">
<iconset resource="pc-controlpanel.qrc">
- <normaloff>:/images/preferences-system-session-services.png</normaloff>:/images/preferences-system-session-services.png</iconset>
+ <normaloff>:/images/preferences-desktop-user-password.png</normaloff>:/images/preferences-desktop-user-password.png</iconset>
</property>
<property name="iconSize">
<size>
@@ -239,20 +224,30 @@
</property>
</widget>
</item>
- <item row="0" column="2">
- <widget class="QPushButton" name="pushUsers">
- <property name="toolTip">
- <string>Add / Remove and edit users on this system.</string>
+ <item row="0" column="6">
+ <spacer name="horizontalSpacer_4">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>183</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="0" column="0">
+ <widget class="QPushButton" name="pushPrint">
<property name="statusTip">
- <string>Add / Remove and edit users on this system.</string>
+ <string>Setup and manage printers on this system.</string>
</property>
<property name="text">
- <string>Users</string>
+ <string>Printers</string>
</property>
<property name="icon">
<iconset resource="pc-controlpanel.qrc">
- <normaloff>:/images/preferences-desktop-user-password.png</normaloff>:/images/preferences-desktop-user-password.png</iconset>
+ <normaloff>:/images/printer.png</normaloff>:/images/printer.png</iconset>
</property>
<property name="iconSize">
<size>
@@ -266,17 +261,27 @@
</widget>
</item>
<item row="0" column="3">
- <spacer name="horizontalSpacer_4">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <widget class="QPushButton" name="pushSystem">
+ <property name="statusTip">
+ <string>System tools and diagnostics</string>
</property>
- <property name="sizeHint" stdset="0">
+ <property name="text">
+ <string>System</string>
+ </property>
+ <property name="icon">
+ <iconset resource="pc-controlpanel.qrc">
+ <normaloff>:/images/system.png</normaloff>:/images/system.png</iconset>
+ </property>
+ <property name="iconSize">
<size>
- <width>183</width>
- <height>20</height>
+ <width>42</width>
+ <height>42</height>
</size>
</property>
- </spacer>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ </widget>
</item>
</layout>
</widget>
@@ -296,9 +301,6 @@
<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 changes on: pcbsd/current/src-qt4/pc-cupscfg/pc-cupscfg
___________________________________________________________________
Added: svn:executable
+ *
Modified: pcbsd/current/src-qt4/src-qt4.pro
===================================================================
--- pcbsd/current/src-qt4/src-qt4.pro 2010-10-09 04:29:17 UTC (rev 7755)
+++ pcbsd/current/src-qt4/src-qt4.pro 2010-10-09 05:10:16 UTC (rev 7756)
@@ -6,6 +6,7 @@
pbreg \
pc-controlpanel \
pc-crashhandler \
+ pc-cupscfg \
pc-pbigui \
pc-pfmanager \
pc-metapkgmanager \
More information about the Commits
mailing list