Nemcio/SysTray-X
1
0
Fork 0
mirror of https://github.com/Ximi1970/systray-x.git synced 2026-07-29 01:01:03 +02:00
Code Issues Packages Projects Releases Activity

Revert some changes

Browse Source
This commit is contained in:
Ximi1970
2021-01-03 22:01:20 +01:00
parent a650d1dd6e
commit a3080028fb
5 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/SysTray-X/SysTray-X-app/preferences.cpp
View File

@@ -62,7 +62,7 @@ Preferences::Preferences( QObject *parent ) : QObject( parent )
m_number_alignment = 4;
m_number_margins = QMargins();
m_minimize_type = PREF_DEFAULT_MINIMIZE;
m_minimize_type = PREF_MINIMIZE_METHOD_1;
m_start_minimized = false;
m_close_type = PREF_MINIMIZE_MAIN_CLOSE_CHILDREN_WINDOWS;

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

@@ -321,7 +321,7 @@
<string>Default minimize</string>
</property>
<property name="checked">
<bool>true</bool>
<bool>false</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">minimizeTypeGroup</string>
@@ -334,7 +334,7 @@
<string>Minimize to tray</string>
</property>
<property name="checked">
<bool>false</bool>
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">minimizeTypeGroup</string>
@@ -694,11 +694,11 @@
</resources>
<connections/>
<buttongroups>
<buttongroup name="themeGroup"/>
<buttongroup name="countTypeGroup"/>
<buttongroup name="minimizeTypeGroup"/>
<buttongroup name="defaultIconTypeGroup"/>
<buttongroup name="iconTypeGroup"/>
<buttongroup name="closeTypeGroup"/>
<buttongroup name="themeGroup"/>
<buttongroup name="countTypeGroup"/>
<buttongroup name="iconTypeGroup"/>
</buttongroups>
</ui>

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

@@ -210,6 +210,10 @@ void WindowCtrl::slotWindowState( Preferences::WindowState state )
emit signalConsole( QString( "Window state: %1, %2" )
.arg( win_ids.at( i ) )
.arg( Preferences::WindowStateString.at( win_states.at( i ) ) ) );
emit signalConsole( QString( "Window state internal: %1, %2" )
.arg( win_ids.at( i ) )
.arg( Preferences::WindowStateString.at( getWindowStateInternal( win_ids.at( i ) ) ) ) );
#endif
if( ( win_states.at( i ) != Preferences::STATE_MINIMIZED && getMinimizeType() == Preferences::PREF_DEFAULT_MINIMIZE ) ||
@@ -227,6 +231,10 @@ void WindowCtrl::slotWindowState( Preferences::WindowState state )
emit signalConsole( QString( "Window state: %1, %2" )
.arg( win_ids.at( i ) )
.arg( Preferences::WindowStateString.at( win_states.at( i ) ) ) );
emit signalConsole( QString( "Window state internal: %1, %2" )
.arg( win_ids.at( i ) )
.arg( Preferences::WindowStateString.at( getWindowStateInternal( win_ids.at( i ) ) ) ) );
#endif
if( ( win_states.at( i ) == Preferences::STATE_MINIMIZED && getMinimizeType() != Preferences::PREF_DEFAULT_MINIMIZE ) )
@@ -298,7 +306,7 @@ void WindowCtrl::slotShowHide()
.arg( win_ids.at( i ) )
.arg( Preferences::WindowStateString.at( win_states.at( i ) ) ) );
emit signalConsole( QString( "Window state: %1, %2" )
emit signalConsole( QString( "Window state internal: %1, %2" )
.arg( win_ids.at( i ) )
.arg( Preferences::WindowStateString.at( getWindowStateInternal( win_ids.at( i ) ) ) ) );
#endif

2
webext/background.js
View File

@@ -302,7 +302,7 @@ SysTrayX.Messaging = {
sendPreferencesStorage: function (result) {
const debug = result.debug || "false";
const minimizeType = result.minimizeType || "0";
const minimizeType = result.minimizeType || "1";
const closeType = result.closeType || "1";
const startMinimized = result.startMinimized || "false";
const restorePositions = result.restorePositions || "false";

2
webext/options.js
View File

@@ -437,7 +437,7 @@ SysTrayX.RestoreOptions = {
//
setMinimizeType: function (result) {
// const platformInfo = result.platformInfo || { os: "linux" };
const minimizeType = result.minimizeType || "0";
const minimizeType = result.minimizeType || "1";
// Tweak option for platform
// if (platformInfo.os === "win") {