From 6c411276434ad362457e4cfb44bacfaeffda4fcc Mon Sep 17 00:00:00 2001 From: In-line Date: Fri, 16 Dec 2016 19:01:34 +0400 Subject: [PATCH] Fix bug with -m option --- DoubleClickFix.pro | 2 +- click_lock_settings.h | 2 +- main.cpp | 3 + mainwindow.cpp | 2 +- mainwindow.ui | 444 +++++++++++++++++++++--------------------- 5 files changed, 228 insertions(+), 225 deletions(-) diff --git a/DoubleClickFix.pro b/DoubleClickFix.pro index 9796f21..583a667 100644 --- a/DoubleClickFix.pro +++ b/DoubleClickFix.pro @@ -12,7 +12,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = DoubleClickFix TEMPLATE = app QMAKE_CXXFLAGS_RELEASE += -O2 -Werror -QMAKE_CXXFLAGS += -Wall -Wextra -Wzero-as-null-pointer-constant -Weffc++ -Wunknown-pragmas +QMAKE_CXXFLAGS += -Wall -Wextra -Weffc++ -Wunknown-pragmas SOURCES += main.cpp\ mainwindow.cpp \ diff --git a/click_lock_settings.h b/click_lock_settings.h index 140060d..8455ba1 100644 --- a/click_lock_settings.h +++ b/click_lock_settings.h @@ -28,8 +28,8 @@ namespace Ui { class click_lock_settings; -struct click_lock_settings_data; } +struct click_lock_settings_data; #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Weffc++" // TODO: Refactor diff --git a/main.cpp b/main.cpp index b3650af..112f544 100644 --- a/main.cpp +++ b/main.cpp @@ -38,7 +38,10 @@ int main(int argc, char *argv[]) } } if(iShowMinimized) + { + w->setMinimizing(true); w->showMinimized(); + } else w->show(); diff --git a/mainwindow.cpp b/mainwindow.cpp index 612e469..3bf487d 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -303,7 +303,7 @@ bool inline MainWindow::isMinimizing() const return m_isMinimizing; } -void inline MainWindow::setMinimizing(bool value) +void MainWindow::setMinimizing(bool value) { m_isMinimizing = value; } diff --git a/mainwindow.ui b/mainwindow.ui index 7236dd1..87f461e 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -2,231 +2,231 @@ MainWindow - - - 0 - 0 - 344 - 351 - - - - - 0 - 0 - - - - ArrowCursor - - - Qt::NoFocus - - - QDoubleClickFix Beta 0.7.2 - - - - :/icon.ico:/icon.ico - - - 0.950000000000000 - - - Qt::LeftToRight - - - false - - - - - - Build Date: DATE_HERE - - - - - - - QLayout::SetMaximumSize - - - - - - - - - Start - - - - - - - Stop - - - - - - - - - - - Block delay: - - - - - - - 3 - - - 0.001000000000000 - - - 9999999.000000000000000 - - - 0.010000000000000 - - - 0.125000000000000 - - - - - - - - - - - Logging: - - - - - - - On - - - - On - - - - - Off - - - - - - - - - - Total: 0 Blocked: 0 - - - - - - - - - - - - - - - Press "Start" when launch - - - - - - - Launch with OS - - - - - - - - 0 - 0 - - - - Start Minimized - - - true - - - true - - - 13 - - - - - - - true - - - - 0 - 0 - - - - Click Lock settings - - - - - - - - - - - - 0 - 0 - - - - QAbstractScrollArea::AdjustIgnored - - - true - - - true - - - Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - + + + 0 + 0 + 352 + 354 + + + + + 0 + 0 + + + + ArrowCursor + + + Qt::NoFocus + + + QDoubleClickFix Beta 0.7.3 + + + + :/icon.ico:/icon.ico + + + 0.950000000000000 + + + Qt::LeftToRight + + + false + + + + + + Build Date: DATE_HERE + + + + + + + QLayout::SetMaximumSize + + + + + + + + + Start + + + + + + + Stop + + + + + + + + + + + Block delay: + + + + + + + 3 + + + 0.001000000000000 + + + 9999999.000000000000000 + + + 0.010000000000000 + + + 0.125000000000000 + + + + + + + + + + + Logging: + + + + + + + On + + + + On + + + + + Off + + + + + + + + + + Total: 0 Blocked: 0 + + + + + + + + + + + + + + + Press "Start" when launch + + + + + + + Launch with OS + + + + + + + + 0 + 0 + + + + Start Minimized + + + true + + + true + + + 13 + + + + + + + true + + + + 0 + 0 + + + + Click Lock settings + + + + + + + + + + + + 0 + 0 + + + + QAbstractScrollArea::AdjustIgnored + + + true + + + true + + + Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + - +