diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a13f75..934858d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ endif() set(MAJOR_VERSION 1) set(MINOR_VERSION 10) -set(PATCH_VERSION 16) +set(PATCH_VERSION 17) set(QPS_VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}) add_definitions(-DQPS_VERSION="${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ea4f847..b6e0abb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,20 +1,19 @@ - -set(SOURCES - proc.cpp +set(SOURCES + proc.cpp qpsapp.cpp - qps.cpp + qps.cpp screenshot.cpp - pstable.cpp - uidstr.cpp - ttystr.cpp - dialogs.cpp - infobar.cpp - fieldsel.cpp - wchan.cpp - prefs.cpp - lookup.cpp - details.cpp - command.cpp + pstable.cpp + uidstr.cpp + ttystr.cpp + dialogs.cpp + infobar.cpp + fieldsel.cpp + wchan.cpp + prefs.cpp + lookup.cpp + details.cpp + command.cpp commandutils.cpp commandmodel.cpp commanddialog.cpp @@ -23,27 +22,27 @@ set(SOURCES watchcond.cpp listmodel.cpp watchdogdialog.cpp - misc.cpp - trayicon.cpp - htable.cpp -# htable2.cpp -# pstable2.cpp - qttableview.cpp + misc.cpp + trayicon.cpp + htable.cpp + # htable2.cpp + # pstable2.cpp + qttableview.cpp ) -SET(HEADERS +SET(HEADERS qpsapp.h - qps.h - screenshot.h - pstable.h - dialogs.h - fieldsel.h - prefs.h - infobar.h - lookup.h - details.h + qps.h + screenshot.h + pstable.h + dialogs.h + fieldsel.h + prefs.h + infobar.h + lookup.h + details.h tablefield.h - command.h + command.h commandutils.h commandmodel.h commanddialog.h @@ -52,12 +51,12 @@ SET(HEADERS watchcond.h listmodel.h watchdogdialog.h - misc.h - trayicon.h - htable.h -# htable2.h -# pstable2.h - qttableview.h + misc.h + trayicon.h + htable.h + # htable2.h + # pstable2.h + qttableview.h ) set(UIS diff --git a/src/commanddialog.cpp b/src/commanddialog.cpp index b54e179..12d75cf 100644 --- a/src/commanddialog.cpp +++ b/src/commanddialog.cpp @@ -132,7 +132,7 @@ CommandDialog::CommandDialog() TBloon *bloon = new TBloon(this); /// for(int i = 0; i < commands.size(); i++) /// listview->insertItem(commands[i]->name); - // listview->addItem(commands[i]->name); + /// listview->addItem(commands[i]->name); /// vbox->freeze(); } diff --git a/src/watchdog.ui b/src/watchdog.ui index 00583a0..a53df12 100644 --- a/src/watchdog.ui +++ b/src/watchdog.ui @@ -28,9 +28,9 @@ border-image: url(:/icon/vista.png); } QWidget { -} +} QFrame, QLabel, QToolTip { - } + }