diff --git a/app/SysTray-X/SysTray-X-app/preferences.ui b/app/SysTray-X/SysTray-X-app/preferences.ui index 1360b9a..ea3c08e 100644 --- a/app/SysTray-X/SysTray-X-app/preferences.ui +++ b/app/SysTray-X/SysTray-X-app/preferences.ui @@ -6,8 +6,8 @@ 0 0 - 544 - 877 + 568 + 520 @@ -17,52 +17,191 @@ :/files/icons/SysTray-X.png:/files/icons/SysTray-X.png - + - - - - - Default icon - - - - - - Icon - - + + + 2 + + + + Windows + + + + + + + + Minimize + + + + + + + + Default minimize + + + false + + + minimizeTypeGroup + + + + + + + Minimize to tray + + + true + + + minimizeTypeGroup + + + + + + + Minimize to tray, method 2 + + + minimizeTypeGroup + + + + + + + + + + + + Close + + + + + + + + Default close + + + closeTypeGroup + + + + + + + Minimize main, close children + + + true + + + closeTypeGroup + + + + + + + Minimize all windows + + + false + + + closeTypeGroup + + + + + + + + + + - + + + Start application minimized + + + + + + + Restore startup positions + + + + + + + + + + + Qt::Horizontal + + + + 296 + 20 + + + + + + + + Qt::Vertical + + + + 20 + 198 + + + + + + + + + Icon + + + + + + Default icon + + + + + + Icon + + - - - Default Thunderbird - - - true - - - defaultIconTypeGroup - - - - - - - Lookthrough icon - - - defaultIconTypeGroup - - - - - + - + - Custom icon + Default Thunderbird + + + true defaultIconTypeGroup @@ -70,641 +209,629 @@ - + - + Lookthrough icon + + defaultIconTypeGroup + - - - Choose - - - false - - + + + + + Custom icon + + + defaultIconTypeGroup + + + + + + + + + + + + + + Choose + + + false + + + + - - - - - - - - KDE integration (Hide) - - - false - - - - - - - - - - Mail notification icon - - - - - - QLayout::SetFixedSize - - - - - Blank icon - - - true - - - iconTypeGroup - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - QLayout::SetFixedSize - - - + - New mail icon - - - iconTypeGroup - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - QLayout::SetMaximumSize - - - - - Custom icon - - - iconTypeGroup - - - - - - - - - - - - - - Choose - - - false - - - - - - - - - - - No icon - - - iconTypeGroup - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - Default Thunderbird - - - iconTypeGroup - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - Theme - - - - - - - - Light - - - true - - - themeGroup - - - - - - - Dark + KDE integration (Hide) false - - themeGroup - - - - - - - - - Qt::Vertical - - - - 20 - 78 - - - - - - - - - - - - Windows - - - - - - - - Minimize - - - - - - - - Default minimize - - - false - - - minimizeTypeGroup - - - - - - - Minimize to tray - - - true - - - minimizeTypeGroup - - - - - - - Minimize to tray, method 2 - - - minimizeTypeGroup - - - - - - - - - - - - Close - - - - - - - - Default close - - - closeTypeGroup - - - - - - - Minimize main, close children - - - true - - - closeTypeGroup - - - - - - - Minimize all windows - - - false - - - closeTypeGroup - - - - - - - - - - - - + + + + + + + + Number properties + + + + - Start application minimized + Display unread message count + + + true + + + + + + + + Number color + + + + + + + Qt::NoFocus + + + + + + + + + + + + + + Number size + + + + + + + 1 + + + 999 + + + 10 + + + + + + + + + + + Alignment + + + + + + + 4 + + + + Top left + + + + + Top centre + + + + + Top right + + + + + Middle left + + + + + Middle centre + + + + + Middle right + + + + + Bottom left + + + + + Bottom centre + + + + + Bottom right + + + + + + + + + + + + + + Margins (left, top, right, bottom): + + + + + + + + + 999 + + + + + + + 999 + + + + + + + 999 + + + + + + + 999 + + + + + + + + + + + + + Startup delay + + + + + + + 0 + + + 99 + + + 5 + + + + + + + + + + + + Count type + + - + + + + + Unread + + + true + + + countTypeGroup + + + + + + + New + + + countTypeGroup + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Theme + + + + + + + + Light + + + true + + + themeGroup + + + + + + + Dark + + + false + + + themeGroup + + + + + + + + + + + + + + Mail notification icon + + + + + + QLayout::SetFixedSize + + + - Restore startup positions + Blank icon + + true + + + iconTypeGroup + + + + + Qt::Horizontal + + + + 40 + 20 + + + + - - - - - - - - - Number properties - - - - - - - Display unread message count + + + QLayout::SetFixedSize - - true - - - - - - + - Number color + New mail icon + + iconTypeGroup + - - - Qt::NoFocus + + + Qt::Horizontal + + + 40 + 20 + + + + + + + + + + QLayout::SetMaximumSize + + + + + Custom icon + + + iconTypeGroup + + + + + - - - - - + - Number size + Choose - - - - - - 1 - - - 999 - - - 10 + + false - + - + - Alignment + No icon + + iconTypeGroup + - - - 4 + + + Qt::Horizontal - - - Top left - - - - - Top centre - - - - - Top right - - - - - Middle left - - - - - Middle centre - - - - - Middle right - - - - - Bottom left - - - - - Bottom centre - - - - - Bottom right - - - + + + 40 + 20 + + + - - - Margins (left, top, right, bottom): - - - - - + - - - 999 + + + Default Thunderbird + + iconTypeGroup + - - - 999 + + + Qt::Horizontal - - - - - - 999 + + + 40 + 20 + - - - - - - 999 - - + - - - - Count type - - - - - - - - Unread - - - true - - - countTypeGroup - - - - - - - New - - - countTypeGroup - - - - - - - - - - - - - - - Startup delay - - - - - - - 0 - - - 99 - - - 5 - - - - - - - - - + + + + + + Qt::Horizontal + + + + 1 + 20 + + + + + + + + Qt::Vertical + + + + 20 + 0 + + + + + + + + + Mail + + + + + + Use the preferences dialog in Thunderbird to select the accounts and folders + + + true + + + + + + + Qt::Horizontal + + + + 265 + 20 + + + + + + + + Qt::Vertical + + + + 20 + 464 + + + + + + + + + Debug + + + + + + Display debug window + + + + + + + Qt::Horizontal + + + + 358 + 20 + + + + + + + + Qt::Vertical + + + + 20 + 485 + + + + + + + - - - - Qt::Vertical - - - - 20 - 37 - - - - - - - - - - Display debug window - - - + + @@ -712,25 +839,29 @@ - 40 + 369 20 - - - Save - - - - - - - Cancel - - + + + + + Cancel + + + + + + + Save + + + + @@ -741,11 +872,11 @@ + + + - - - diff --git a/app/SysTray-X/SysTray-X-app/systrayx.cpp b/app/SysTray-X/SysTray-X-app/systrayx.cpp index 3abdda0..6561c50 100644 --- a/app/SysTray-X/SysTray-X-app/systrayx.cpp +++ b/app/SysTray-X/SysTray-X-app/systrayx.cpp @@ -72,8 +72,6 @@ SysTrayX::SysTrayX( QObject *parent ) : QObject( parent ) * Setup preferences dialog */ m_pref_dialog = new PreferencesDialog( m_link, m_preferences ); - m_pref_dialog->setFixedHeight( m_pref_dialog->sizeHint().height() ); - m_pref_dialog->setFixedWidth( m_pref_dialog->sizeHint().width() + 16 ); /* * Setup debug window