Commit 6f65b02e authored by Alf Gaida's avatar Alf Gaida

Adding upstream version 2015.10.03.

parent beea3b36
......@@ -18,24 +18,6 @@ TARGET = cmst
target.path = /usr/bin
INSTALLS += target
documentation.path = $$CMST_DOC_PATH/man1
documentation.files = ../../misc/manpage/cmst.1.gz
documentation.CONFIG = no_check_exist
documentation.extra = gzip --force --keep ../../misc/manpage/cmst.1
INSTALLS += documentation
desktop.path = /usr/share/applications
desktop.files = ../../misc/desktop/cmst.desktop
INSTALLS += desktop
autostart.path = /usr/share/cmst/autostart
autostart.files = ../../misc/desktop/cmst-autostart.desktop
INSTALLS += autostart
icon.path = /usr/share/icons/hicolor/24x24/apps
icon.files = ../../images/application/cmst.png
INSTALLS += icon
# dbus
DBUS_ADAPTORS += ./code/agent/org.monkey_business_enterprises.agent.xml
DBUS_INTERFACES += ./code/agent/org.monkey_business_enterprises.agent.xml
......
......@@ -110,6 +110,7 @@ QVariantMap ConnmanAgent::RequestInput(QDBusObjectPath path, QMap<QString,QVaria
// Send our input_map to the dialog to have the user supply the necessary information
// needed to continue. Return if canceled.
if (this->uiDialog->showPage0(input_map) == QDialog::Rejected) this->sendErrorReply(ERROR_CANCELED,"User cancelled the dialog");
// Create a return dict and send it back to connman on DBus
QMap<QString,QVariant> rtn;
......
......@@ -60,7 +60,7 @@ AgentDialog::AgentDialog(QWidget* parent)
connect (ui.checkBox_hide_passphrase, SIGNAL(clicked(bool)), this, SLOT(hidePassphrase(bool)));
connect (ui.checkBox_wps_no_pin, SIGNAL(clicked(bool)), this, SLOT(useWPSPushButton(bool)));
connect (ui.pushButton_launch_browser,SIGNAL(clicked()), this, SLOT(launchBrowser()));
connect (ui.lineEdit_browser, SIGNAL(textEdited(const QString&)), this, SLOT(enteringBrowser(const QString&)));
connect (ui.lineEdit_browser, SIGNAL(textEdited(const QString&)), this, SLOT(enteringBrowser()));
// find the PATH of the current environment
sys_env_path = QString();
......
......@@ -182,6 +182,13 @@ ControlBox::ControlBox(const QCommandLineParser& parser, QWidget *parent)
if (b_so && ui.checkBox_systemicontheme->isChecked() )
QIcon::setThemeName(ui.lineEdit_icontheme->text() );
else QIcon::setThemeName(INTERNAL_THEME);
// Set the window icon. If an icon was installed to /usr/share/icons/hicolor/24x24/apps
// use that, otherwise use a freedesktop.org named one
if (QFile::exists("/usr/share/icons/hicolor/scalable/apps/cmst.svg") )
this->setWindowIcon(QIcon("/usr/share/icons/hicolor/scalable/apps/cmst.svg") );
else
this->setWindowIcon(QIcon::fromTheme("preferences-system-network") );
// Set the whatsthis icons
ui.toolButton_whatsthis->setIcon(iconman->getIcon("whats_this"));
......@@ -2227,8 +2234,7 @@ void ControlBox::connectNotifyClient()
.arg(notifyclient->getServerSpecVersion() );
ui.label_serverstatus->clear();
ui.label_serverstatus->setDisabled(true);
ui.groupBox_notifications->setToolTip(tr("%1 detected").arg(name) );
ui.groupBox_notifications->setWhatsThis(lab);
ui.groupBox_notifications->setToolTip(lab);
}
// not successful, try again or abandon if counter is at limit
else {
......@@ -2313,4 +2319,4 @@ void ControlBox::cleanUp()
return;
}
......@@ -19,10 +19,6 @@
<property name="windowTitle">
<string>Dialog</string>
</property>
<property name="windowIcon">
<iconset resource="../../../../../cmst.qrc">
<normaloff>:/icons/images/application/cmst.png</normaloff>:/icons/images/application/cmst.png</iconset>
</property>
<property name="sizeGripEnabled">
<bool>true</bool>
</property>
......@@ -439,8 +435,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>603</width>
<height>390</height>
<width>98</width>
<height>54</height>
</rect>
</property>
<layout class="QVBoxLayout" name="_2">
......@@ -688,8 +684,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>579</width>
<height>146</height>
<width>98</width>
<height>46</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_9">
......@@ -744,8 +740,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>579</width>
<height>146</height>
<width>98</width>
<height>46</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_10">
......@@ -1392,8 +1388,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>493</width>
<height>468</height>
<width>98</width>
<height>412</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_8">
......
......@@ -168,6 +168,7 @@ int main(int argc, char *argv[])
QStringList sl = parser.unknownOptionNames();
if (sl.size() > 0 ) parser.showHelp(1);
if (parser.isSet("help") ) parser.showHelp(1);
if (parser.isSet("version") ) parser.showVersion();
// signal handler
signal(SIGINT, signalhandler);
......
......@@ -35,8 +35,8 @@ DEALINGS IN THE SOFTWARE.
///////////////////////////////// Program Values ///////////////////////
//
// Program Info (may be visible, but don't mark for tranalation)
#define VERSION "2015.09.10-1"
#define RELEASE_DATE "1 March 2015"
#define VERSION "2015.10.03-1"
#define RELEASE_DATE "3 October 2015"
#define COPYRIGHT_DATE "2013-2015"
// Program Values:
......
......@@ -14,3 +14,38 @@ TRANSLATIONS += ./translations/cmst_pl_PL.ts
TRANSLATIONS += ./translations/cmst_it_IT.ts
TRANSLATIONS += ./translations/cmst_es_ES.ts
TRANSLATIONS += ./translations/cmst_es_CO.ts
# non-application files which need to be installed
#
# documentation (manpage)
documentation.path = $$CMST_DOC_PATH/man1
documentation.files = ./misc/manpage/cmst.1.gz
documentation.CONFIG = no_check_exist
documentation.extra = gzip --force --keep ./misc/manpage/cmst.1
INSTALLS += documentation
# application icons - scalable icon (used internally) won't be used
# unless the 24x24 (used for desktop files) exists.
exists(./images/application/cmst.png)
icon24.path = /usr/share/icons/hicolor/24x24/apps
icon24.files = ./images/application/cmst.png
INSTALLS += icon24
exists(./images/application/cmst.svg) {
iconsvg.path = /usr/share/icons/hicolor/scalable/apps
iconsvg.files = ./images/application/cmst.svg
INSTALLS += iconsvg
}
else {
system(sed -i 's/Icon=cmst/Icon=preferences-system-network/g' "./misc/desktop/cmst.desktop")
system(sed -i 's/Icon=cmst/Icon=preferences-system-network/g' "./misc/desktop/cmst-autostart.desktop")
}
# desktop file
desktop.path = /usr/share/applications
desktop.files = ./misc/desktop/cmst.desktop
INSTALLS += desktop
# autostart desktop file
autostart.path = /usr/share/cmst/autostart
autostart.files = ./misc/desktop/cmst-autostart.desktop
INSTALLS += autostart
......@@ -18,7 +18,6 @@
<file>images/systemtray/connect_creating.png</file>
<file>images/systemtray/cancel.png</file>
<file>images/systemtray/connect_no.png</file>
<file>images/application/cmst.png</file>
<file>images/systemtray/wired_established.png</file>
<file>images/systemtray/wl000.png</file>
<file>images/systemtray/wl025.png</file>
......
images/application/cmst.png

15.8 KB | W: | H:

images/application/cmst.png

2.35 KB | W: | H:

images/application/cmst.png
images/application/cmst.png
images/application/cmst.png
images/application/cmst.png
  • 2-up
  • Swipe
  • Onion skin
This source diff could not be displayed because it is too large. You can view the blob instead.
Program icons are located in the ./variations subdirectory.
To build one into the program either copy or symlink the icon you wish
to use into this directory and call it: cmst.png
To build one into the program either copy or symlink the icons you wish
to use into this directory and call them: cmst.png and cmst.svg. You need
both the 24x24 PNG version and scalable SVG versions copied.
If you wish to use the freedesktop theme icon (preferences-system-network) for
the program icon then simply do not copy or symlink a cmst.png file. The
scalable version is ignored if the 24x24 PNG version does not exist. If
the 24x24 verison is not found the theme icon will be used instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
.TH CMST 1 "1 March 2015" "Version: 2015.03.28"
.TH CMST 1 "3 October 2015" "Version: 2015.10.03"
.SH NAME
CMST - Connman System Tray
.SH SYNOPSIS
......
<b><center>Connman System Tray (CMST)</center></b>
<b><center>Change Log</center></b>
<br><b>In Progress</b>
<br><b>2015.10.03</b>
<ul>
<li>Browser selections in Agent dialog improved and added xdg-open option (by Yaohan Chen).</li>
<li>-i (--icon-theme) command line option will now accept a theme name.</li>
......@@ -10,6 +10,7 @@
<li>Restoring window size and geometry is now independent from the other settings.</li>
<li>Added -b command line option to bypass restoring window state if that option is set in Preferences.</li>
<li>Added -B command line option to bypass all startup options set in Preferences.</li>
<li>New CMST icon (by Progandy).</li>
</ul>
<br><b>2015.03.01</b>
<ul>
......
......@@ -61,11 +61,6 @@
#
#
#
# application icons
[icon]
icon_name = cmsticon
resource = :/icons/images/application/cmst.png
#
# interface icons
[icon]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment