Nemcio/SysTray-X
1
0
Fork 0
mirror of https://github.com/Ximi1970/systray-x.git synced 2025-11-07 13:55:58 +01:00
Code Issues Packages Projects Releases Activity

Fix, cleanup

Browse Source
This commit is contained in:
Ximi1970
2020-04-11 23:31:22 +02:00
parent 73bc9fde3b
commit 012a791c66
6 changed files with 208 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

345
app/SysTray-X/preferences.ui
View File

@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>692</width> <width>676</width>
<height>310</height> <height>278</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -20,172 +20,6 @@
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0"> <item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0" rowspan="2">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Windows</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QRadioButton" name="defaultMinimizeRadioButton">
<property name="text">
<string>Default minimize</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">minimizeTypeGroup</string>
</attribute>
</widget>
</item>
<item>
<widget class="QRadioButton" name="minimizeMethod1RadioButton">
<property name="text">
<string>Minimize to tray, method 1</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">minimizeTypeGroup</string>
</attribute>
</widget>
</item>
<item>
<widget class="QRadioButton" name="minimizeMethod2RadioButton">
<property name="text">
<string>Minimize to tray, method 2</string>
</property>
<attribute name="buttonGroup">
<string notr="true">minimizeTypeGroup</string>
</attribute>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="startMinimizedCheckBox">
<property name="text">
<string>Start application minimized</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="1">
<widget class="QGroupBox" name="iconTypeGroupBox">
<property name="title">
<string>Mail notification icon</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="sizeConstraint">
<enum>QLayout::SetFixedSize</enum>
</property>
<item>
<widget class="QRadioButton" name="blankRadioButton">
<property name="text">
<string>Blank icon</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">iconTypeGroup</string>
</attribute>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<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>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="sizeConstraint">
<enum>QLayout::SetFixedSize</enum>
</property>
<item>
<widget class="QRadioButton" name="newMailButton">
<property name="text">
<string>New mail icon</string>
</property>
<attribute name="buttonGroup">
<string notr="true">iconTypeGroup</string>
</attribute>
</widget>
</item>
<item>
<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>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="sizeConstraint">
<enum>QLayout::SetMaximumSize</enum>
</property>
<item>
<widget class="QRadioButton" name="customRadioButton">
<property name="text">
<string>Custom icon</string>
</property>
<attribute name="buttonGroup">
<string notr="true">iconTypeGroup</string>
</attribute>
</widget>
</item>
<item>
<widget class="QLabel" name="imageLabel">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="chooseCustomButton">
<property name="text">
<string>Choose</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item row="0" column="2"> <item row="0" column="2">
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox_2">
<property name="title"> <property name="title">
@@ -299,6 +133,181 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1">
<widget class="QGroupBox" name="iconTypeGroupBox">
<property name="title">
<string>Mail notification icon</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="sizeConstraint">
<enum>QLayout::SetFixedSize</enum>
</property>
<item>
<widget class="QRadioButton" name="blankRadioButton">
<property name="text">
<string>Blank icon</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">iconTypeGroup</string>
</attribute>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<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>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="sizeConstraint">
<enum>QLayout::SetFixedSize</enum>
</property>
<item>
<widget class="QRadioButton" name="newMailButton">
<property name="text">
<string>New mail icon</string>
</property>
<attribute name="buttonGroup">
<string notr="true">iconTypeGroup</string>
</attribute>
</widget>
</item>
<item>
<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>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="sizeConstraint">
<enum>QLayout::SetMaximumSize</enum>
</property>
<item>
<widget class="QRadioButton" name="customRadioButton">
<property name="text">
<string>Custom icon</string>
</property>
<attribute name="buttonGroup">
<string notr="true">iconTypeGroup</string>
</attribute>
</widget>
</item>
<item>
<widget class="QLabel" name="imageLabel">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="chooseCustomButton">
<property name="text">
<string>Choose</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item row="0" column="0" rowspan="2">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Windows</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QGroupBox" name="groupBox_4">
<property name="title">
<string>Minimize</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QRadioButton" name="defaultMinimizeRadioButton">
<property name="text">
<string>Default minimize</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">minimizeTypeGroup</string>
</attribute>
</widget>
</item>
<item>
<widget class="QRadioButton" name="minimizeMethod1RadioButton">
<property name="text">
<string>Minimize to tray, method 1</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">minimizeTypeGroup</string>
</attribute>
</widget>
</item>
<item>
<widget class="QRadioButton" name="minimizeMethod2RadioButton">
<property name="text">
<string>Minimize to tray, method 2</string>
</property>
<attribute name="buttonGroup">
<string notr="true">minimizeTypeGroup</string>
</attribute>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QCheckBox" name="startMinimizedCheckBox">
<property name="text">
<string>Start application minimized</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout> </layout>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">

24
app/SysTray-X/windowctrl-unix.cpp
View File

@@ -286,28 +286,9 @@ void WindowCtrlUnix::minimizeWindow( quint64 window, int hide )
return; return;
} }
switch( hide ) hideWindow( window, hide );
{
case Preferences::PREF_MINIMIZE_METHOD_1:
{
hideWindowEvent( window, hide );
break;
}
case Preferences::PREF_MINIMIZE_METHOD_2:
{
hideWindowAtom( window, hide );
break;
}
default:
{
break;
}
}
XIconifyWindow( m_display, static_cast<Window>( window ), m_screen ); XIconifyWindow( m_display, static_cast<Window>( window ), m_screen );
XFlush( m_display ); XFlush( m_display );
} }
@@ -317,7 +298,7 @@ void WindowCtrlUnix::minimizeWindow( quint64 window, int hide )
*/ */
void WindowCtrlUnix::hideWindow( quint64 window, int set ) void WindowCtrlUnix::hideWindow( quint64 window, int set )
{ {
switch( set ) switch( m_minimize_type )
{ {
case Preferences::PREF_MINIMIZE_METHOD_1: case Preferences::PREF_MINIMIZE_METHOD_1:
{ {
@@ -339,7 +320,6 @@ void WindowCtrlUnix::hideWindow( quint64 window, int set )
} }
/* /*
* Normalize a window * Normalize a window
*/ */

3
app/SysTray-X/windowctrl.cpp
View File

@@ -72,12 +72,11 @@ void WindowCtrl::slotWindowTest2()
emit signalConsole("Test 2 started"); emit signalConsole("Test 2 started");
// Do something. // Do something.
hideWindow( getWinId(), true );
// findWindow( m_ppid ); // findWindow( m_ppid );
// emit signalConsole( QString( "Hwnd ppid: %1" ).arg( getWinIds()[0] ) ); // emit signalConsole( QString( "Hwnd ppid: %1" ).arg( getWinIds()[0] ) );
hideWindow( getWinId(), true );
emit signalConsole("Test 2 done"); emit signalConsole("Test 2 done");
} }

6
webext/background.js
View File

@@ -382,10 +382,16 @@ async function start() {
SysTrayX.platformInfo = await browser.runtime SysTrayX.platformInfo = await browser.runtime
.getPlatformInfo() .getPlatformInfo()
.then((info) => info); .then((info) => info);
console.log("OS: " + SysTrayX.platformInfo.os); console.log("OS: " + SysTrayX.platformInfo.os);
console.log("Arch: " + SysTrayX.platformInfo.arch); console.log("Arch: " + SysTrayX.platformInfo.arch);
console.log("Nack-Arch: " + SysTrayX.platformInfo.nacl_arch); console.log("Nack-Arch: " + SysTrayX.platformInfo.nacl_arch);
// Store platform info
browser.storage.sync.set({
platformInfo: SysTrayX.platformInfo,
});
// Get addon version // Get addon version
SysTrayX.version = browser.runtime.getManifest().version; SysTrayX.version = browser.runtime.getManifest().version;
console.log("Addon version: " + SysTrayX.version); console.log("Addon version: " + SysTrayX.version);

4
webext/css/options.css
View File

@@ -63,14 +63,14 @@ body {
#minimizeselect { #minimizeselect {
border-style: solid; border-style: solid;
border-width: 1px; border-width: 1px;
margin: 10px 10px 10px 10px; margin: 10px 10px 10px 10px;
padding: 10px 10px 10px 10px; padding: 10px 10px 10px 10px;
} }
#iconselect { #iconselect {
border-style: solid; border-style: solid;
border-width: 1px; border-width: 1px;
margin: 10px 10px 10px 10px; margin: 10px 10px 10px 10px;
padding: 10px 10px 10px 10px; padding: 10px 10px 10px 10px;
} }

42
webext/options.js
View File

@@ -150,7 +150,10 @@ SysTrayX.RestoreOptions = {
// //
// Restore minimize type // Restore minimize type
// //
const getMinimizeType = browser.storage.sync.get("minimizeType"); const getMinimizeType = browser.storage.sync.get([
"platformInfo",
"minimizeType",
]);
getMinimizeType.then( getMinimizeType.then(
SysTrayX.RestoreOptions.setMinimizeType, SysTrayX.RestoreOptions.setMinimizeType,
SysTrayX.RestoreOptions.onMinimizeTypeError SysTrayX.RestoreOptions.onMinimizeTypeError
@@ -238,7 +241,22 @@ SysTrayX.RestoreOptions = {
// Restore minimize type callbacks // Restore minimize type callbacks
// //
setMinimizeType: function (result) { setMinimizeType: function (result) {
const platformInfo = result.platformInfo || { os: "linux" };
const minimizeType = result.minimizeType || "1"; const minimizeType = result.minimizeType || "1";
// Tweak option for platform
if (platformInfo.os === "win") {
document.getElementById("minimizemethod1label").innerHTML =
"Minimize to tray";
document
.getElementById("minimizemethod2")
.setAttribute("style", "display:none;");
if (minimizeType === "2") {
minimizeType = "1";
}
}
const radioButton = document.querySelector( const radioButton = document.querySelector(
`input[name="minimizeType"][value="${minimizeType}"]` `input[name="minimizeType"][value="${minimizeType}"]`
); );
@@ -461,27 +479,6 @@ SysTrayX.StorageChanged = {
// Main // Main
// //
// Set platform
//SysTrayX.platformInfo = await browser.runtime
// .getPlatformInfo()
// .then((info) => info);
/*
// Tweak options for platform
if (SysTrayX.platformInfo.os === "win") {
console.debug("Win");
}
if (SysTrayX.platformInfo.os === "linux") {
console.debug("Linux");
}
*/
document.getElementById("minimizemethod1label").innerHTML =
"Minimize to tray";
document
.getElementById("minimizemethod2")
.setAttribute("style", "display:none;");
// Get addon version // Get addon version
SysTrayX.version = browser.runtime.getManifest().version; SysTrayX.version = browser.runtime.getManifest().version;
document.getElementById("VersioHomeLink").href = document.getElementById("VersioHomeLink").href =
@@ -493,4 +490,3 @@ document
.addEventListener("submit", SysTrayX.SaveOptions.start); .addEventListener("submit", SysTrayX.SaveOptions.start);
browser.storage.onChanged.addListener(SysTrayX.StorageChanged.changed); browser.storage.onChanged.addListener(SysTrayX.StorageChanged.changed);