From a914f5f8fa9225d0b6a28babb0bac664809a2b8c Mon Sep 17 00:00:00 2001 From: roosslan Date: Wed, 14 Oct 2026 12:41:08 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D1=85=D0=BE=D0=B4=D0=BD=D0=B8?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=B5=D1=81=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=B2=20=D0=B4=D0=B8=D1=80=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=B8=D1=8E=20src?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fuzzy_clock.pro | 26 +++++++++--------- readme.md | 3 +- app.ico => res/app.ico | Bin resource.rc => res/resource.rc | 0 fuzzy_clock.cpp => src/fuzzy_clock.cpp | 0 fuzzy_clock.h => src/fuzzy_clock.h | 0 .../fuzzy_clock_window.cpp | 0 .../fuzzy_clock_window.h | 0 fuzzy_dock.cpp => src/fuzzy_dock.cpp | 0 fuzzy_dock.h => src/fuzzy_dock.h | 0 fuzzy_helper.cpp => src/fuzzy_helper.cpp | 0 fuzzy_helper.h => src/fuzzy_helper.h | 0 main.cpp => src/main.cpp | 0 tests/tests.pro | 14 +++++----- 14 files changed, 21 insertions(+), 22 deletions(-) rename app.ico => res/app.ico (100%) rename resource.rc => res/resource.rc (100%) rename fuzzy_clock.cpp => src/fuzzy_clock.cpp (100%) rename fuzzy_clock.h => src/fuzzy_clock.h (100%) rename fuzzy_clock_window.cpp => src/fuzzy_clock_window.cpp (100%) rename fuzzy_clock_window.h => src/fuzzy_clock_window.h (100%) rename fuzzy_dock.cpp => src/fuzzy_dock.cpp (100%) rename fuzzy_dock.h => src/fuzzy_dock.h (100%) rename fuzzy_helper.cpp => src/fuzzy_helper.cpp (100%) rename fuzzy_helper.h => src/fuzzy_helper.h (100%) rename main.cpp => src/main.cpp (100%) diff --git a/fuzzy_clock.pro b/fuzzy_clock.pro index 981a3ba..e91bd04 100644 --- a/fuzzy_clock.pro +++ b/fuzzy_clock.pro @@ -10,25 +10,25 @@ LIBS += \ -lgdi32 \ -lcomdlg32 -RC_ICONS = app.ico -ICON = app.ico -win32: RC_FILE = resource.rc +RC_ICONS = res/app.ico +ICON = res/app.ico +win32: RC_FILE = res/resource.rc HEADERS += \ - fuzzy_clock.h \ - fuzzy_dock.h \ - fuzzy_helper.h \ - fuzzy_clock_window.h + src/fuzzy_clock.h \ + src/fuzzy_dock.h \ + src/fuzzy_helper.h \ + src/fuzzy_clock_window.h SOURCES += \ - fuzzy_clock.cpp \ - fuzzy_dock.cpp \ - fuzzy_helper.cpp \ - fuzzy_clock_window.cpp \ - main.cpp + src/fuzzy_clock.cpp \ + src/fuzzy_dock.cpp \ + src/fuzzy_helper.cpp \ + src/fuzzy_clock_window.cpp \ + src/main.cpp DISTFILES += \ fuzzy.conf \ readme.md \ style.css \ - resource.rc + res/resource.rc diff --git a/readme.md b/readme.md index 07897f5..a07830e 100644 --- a/readme.md +++ b/readme.md @@ -6,12 +6,11 @@ ![fuzzy_clock.gif](fuzzy_clock.gif) - ## Сборка Требуется Windows, Qt 6 (модуль `widgets`) и MSVC. -Сборка либо в в Qt Creator либо из командной строки msvs: +Сборка либо в Qt Creator либо из командной строки msvs: ```bat qmake fuzzy_clock.pro diff --git a/app.ico b/res/app.ico similarity index 100% rename from app.ico rename to res/app.ico diff --git a/resource.rc b/res/resource.rc similarity index 100% rename from resource.rc rename to res/resource.rc diff --git a/fuzzy_clock.cpp b/src/fuzzy_clock.cpp similarity index 100% rename from fuzzy_clock.cpp rename to src/fuzzy_clock.cpp diff --git a/fuzzy_clock.h b/src/fuzzy_clock.h similarity index 100% rename from fuzzy_clock.h rename to src/fuzzy_clock.h diff --git a/fuzzy_clock_window.cpp b/src/fuzzy_clock_window.cpp similarity index 100% rename from fuzzy_clock_window.cpp rename to src/fuzzy_clock_window.cpp diff --git a/fuzzy_clock_window.h b/src/fuzzy_clock_window.h similarity index 100% rename from fuzzy_clock_window.h rename to src/fuzzy_clock_window.h diff --git a/fuzzy_dock.cpp b/src/fuzzy_dock.cpp similarity index 100% rename from fuzzy_dock.cpp rename to src/fuzzy_dock.cpp diff --git a/fuzzy_dock.h b/src/fuzzy_dock.h similarity index 100% rename from fuzzy_dock.h rename to src/fuzzy_dock.h diff --git a/fuzzy_helper.cpp b/src/fuzzy_helper.cpp similarity index 100% rename from fuzzy_helper.cpp rename to src/fuzzy_helper.cpp diff --git a/fuzzy_helper.h b/src/fuzzy_helper.h similarity index 100% rename from fuzzy_helper.h rename to src/fuzzy_helper.h diff --git a/main.cpp b/src/main.cpp similarity index 100% rename from main.cpp rename to src/main.cpp diff --git a/tests/tests.pro b/tests/tests.pro index 28f4861..27e9fa2 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -3,16 +3,16 @@ QT = core testlib CONFIG += console testcase TARGET = fuzzy_clock_tests -INCLUDEPATH += .. +INCLUDEPATH += ../src DEFINES += SOURCE_DIR=\\\"$$PWD/..\\\" HEADERS += \ - ../fuzzy_clock.h \ - ../fuzzy_dock.h \ - ../fuzzy_helper.h + ../src/fuzzy_clock.h \ + ../src/fuzzy_dock.h \ + ../src/fuzzy_helper.h SOURCES += \ tst_fuzzy_clock.cpp \ - ../fuzzy_clock.cpp \ - ../fuzzy_dock.cpp \ - ../fuzzy_helper.cpp + ../src/fuzzy_clock.cpp \ + ../src/fuzzy_dock.cpp \ + ../src/fuzzy_helper.cpp