diff --git a/companion/src/companion.qrc b/companion/src/companion.qrc index 98566439777..bd395a44389 100644 --- a/companion/src/companion.qrc +++ b/companion/src/companion.qrc @@ -190,6 +190,8 @@ themes/monochrome/16/stop.png themes/monochrome/16/write_eeprom.png themes/monochrome/16/sdsync.png + themes/monochrome/16/folder-tree-read.png + themes/monochrome/16/folder-tree-write.png themes/monochrome/24/paintbrush.png themes/monochrome/24/open.png themes/monochrome/24/edit.png @@ -234,6 +236,8 @@ themes/monochrome/24/stop.png themes/monochrome/24/write_eeprom.png themes/monochrome/24/sdsync.png + themes/monochrome/24/folder-tree-read.png + themes/monochrome/24/folder-tree-write.png themes/monochrome/32/paintbrush.png themes/monochrome/32/open.png themes/monochrome/32/edit.png @@ -278,6 +282,8 @@ themes/monochrome/32/stop.png themes/monochrome/32/write_eeprom.png themes/monochrome/32/sdsync.png + themes/monochrome/32/folder-tree-read.png + themes/monochrome/32/folder-tree-write.png themes/monochrome/48/paintbrush.png themes/monochrome/48/open.png themes/monochrome/48/edit.png @@ -322,6 +328,8 @@ themes/monochrome/48/stop.png themes/monochrome/48/write_eeprom.png themes/monochrome/48/sdsync.png + themes/monochrome/48/folder-tree-read.png + themes/monochrome/48/folder-tree-write.png themes/classic/16/paintbrush.png themes/classic/16/open.png themes/classic/16/edit.png @@ -366,6 +374,8 @@ themes/classic/16/stop.png themes/classic/16/write_eeprom.png themes/classic/16/sdsync.png + themes/classic/16/folder-tree-read.png + themes/classic/16/folder-tree-write.png themes/classic/24/paintbrush.png themes/classic/24/open.png themes/classic/24/edit.png @@ -410,6 +420,8 @@ themes/classic/24/stop.png themes/classic/24/write_eeprom.png themes/classic/24/sdsync.png + themes/classic/24/folder-tree-read.png + themes/classic/24/folder-tree-write.png themes/classic/32/paintbrush.png themes/classic/32/open.png themes/classic/32/edit.png @@ -454,6 +466,8 @@ themes/classic/32/stop.png themes/classic/32/write_eeprom.png themes/classic/32/sdsync.png + themes/classic/32/folder-tree-read.png + themes/classic/32/folder-tree-write.png themes/classic/48/paintbrush.png themes/classic/48/open.png themes/classic/48/edit.png @@ -498,6 +512,8 @@ themes/classic/48/stop.png themes/classic/48/write_eeprom.png themes/classic/48/sdsync.png + themes/classic/48/folder-tree-read.png + themes/classic/48/folder-tree-write.png themes/monoblue/16/paintbrush.png themes/monoblue/16/open.png themes/monoblue/16/edit.png @@ -542,6 +558,8 @@ themes/monoblue/16/stop.png themes/monoblue/16/write_eeprom.png themes/monoblue/16/sdsync.png + themes/monoblue/16/folder-tree-read.png + themes/monoblue/16/folder-tree-write.png themes/monoblue/24/paintbrush.png themes/monoblue/24/open.png themes/monoblue/24/edit.png @@ -586,6 +604,8 @@ themes/monoblue/24/stop.png themes/monoblue/24/write_eeprom.png themes/monoblue/24/sdsync.png + themes/monoblue/24/folder-tree-read.png + themes/monoblue/24/folder-tree-write.png themes/monoblue/32/paintbrush.png themes/monoblue/32/open.png themes/monoblue/32/edit.png @@ -630,6 +650,8 @@ themes/monoblue/32/stop.png themes/monoblue/32/write_eeprom.png themes/monoblue/32/sdsync.png + themes/monoblue/32/folder-tree-read.png + themes/monoblue/32/folder-tree-write.png themes/monoblue/48/paintbrush.png themes/monoblue/48/open.png themes/monoblue/48/edit.png @@ -674,6 +696,8 @@ themes/monoblue/48/stop.png themes/monoblue/48/write_eeprom.png themes/monoblue/48/sdsync.png + themes/monoblue/48/folder-tree-read.png + themes/monoblue/48/folder-tree-write.png themes/monowhite/16/paintbrush.png themes/monowhite/16/open.png themes/monowhite/16/edit.png @@ -718,6 +742,8 @@ themes/monowhite/16/stop.png themes/monowhite/16/write_eeprom.png themes/monowhite/16/sdsync.png + themes/monowhite/16/folder-tree-read.png + themes/monowhite/16/folder-tree-write.png themes/monowhite/24/paintbrush.png themes/monowhite/24/open.png themes/monowhite/24/edit.png @@ -762,6 +788,8 @@ themes/monowhite/24/stop.png themes/monowhite/24/write_eeprom.png themes/monowhite/24/sdsync.png + themes/monowhite/24/folder-tree-read.png + themes/monowhite/24/folder-tree-write.png themes/monowhite/32/paintbrush.png themes/monowhite/32/open.png themes/monowhite/32/edit.png @@ -806,6 +834,8 @@ themes/monowhite/32/stop.png themes/monowhite/32/write_eeprom.png themes/monowhite/32/sdsync.png + themes/monowhite/32/folder-tree-read.png + themes/monowhite/32/folder-tree-write.png themes/monowhite/48/paintbrush.png themes/monowhite/48/open.png themes/monowhite/48/edit.png @@ -850,6 +880,8 @@ themes/monowhite/48/stop.png themes/monowhite/48/write_eeprom.png themes/monowhite/48/sdsync.png + themes/monowhite/48/folder-tree-read.png + themes/monowhite/48/folder-tree-write.png themes/yerico/16/paintbrush.png themes/yerico/16/open.png themes/yerico/16/edit.png @@ -894,6 +926,8 @@ themes/yerico/16/stop.png themes/yerico/16/write_eeprom.png themes/yerico/16/sdsync.png + themes/yerico/16/folder-tree-read.png + themes/yerico/16/folder-tree-write.png themes/yerico/24/paintbrush.png themes/yerico/24/open.png themes/yerico/24/edit.png @@ -938,6 +972,8 @@ themes/yerico/24/stop.png themes/yerico/24/write_eeprom.png themes/yerico/24/sdsync.png + themes/yerico/24/folder-tree-read.png + themes/yerico/24/folder-tree-write.png themes/yerico/32/paintbrush.png themes/yerico/32/open.png themes/yerico/32/edit.png @@ -982,6 +1018,8 @@ themes/yerico/32/stop.png themes/yerico/32/write_eeprom.png themes/yerico/32/sdsync.png + themes/yerico/32/folder-tree-read.png + themes/yerico/32/folder-tree-write.png themes/yerico/48/paintbrush.png themes/yerico/48/open.png themes/yerico/48/edit.png @@ -1026,6 +1064,8 @@ themes/yerico/48/stop.png themes/yerico/48/write_eeprom.png themes/yerico/48/sdsync.png + themes/yerico/48/folder-tree-read.png + themes/yerico/48/folder-tree-write.png sounds/0.wav sounds/1.wav sounds/2.wav diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index d32911993e4..0f318981f4b 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -890,8 +890,8 @@ void MainWindow::createActions() recentFilesAct = addAct("recentdocument.png"); closeAct = addAct("clear.png", SLOT(closeFile()) /*, QKeySequence::Close*/); // setting/showing this shortcut interferes with the system one (Ctrl+W/Ctrl-F4) // TODO change to more appropriate icon sets and uncomment toolbar actions - writeSettingsSDPathAct = addAct("save.png", SLOT(writeSettingsSDPath())); - readSettingsSDPathAct = addAct("open.png", SLOT(readSettingsSDPath())); + writeSettingsSDPathAct = addAct("folder-tree-write.png", SLOT(writeSettingsSDPath())); + readSettingsSDPathAct = addAct("folder-tree-read.png", SLOT(readSettingsSDPath())); // end TODO exitAct = addAct("exit.png", SLOT(closeAllWindows()), QKeySequence::Quit, qApp); @@ -1067,9 +1067,8 @@ void MainWindow::createToolBars() fileToolBar->addAction(saveAct); fileToolBar->addAction(closeAct); fileToolBar->addSeparator(); - // TODO add after icon set changed to more appropriate as currently same as read and write file - // fileToolBar->addAction(readSettingsSDPathAct); - // fileToolBar->addAction(writeSettingsSDPathAct); + fileToolBar->addAction(readSettingsSDPathAct); + fileToolBar->addAction(writeSettingsSDPathAct); // workaround for default split button appearance of action with menu :-/ QToolButton * btn; diff --git a/companion/src/themes/classic/16/folder-tree-read.png b/companion/src/themes/classic/16/folder-tree-read.png new file mode 100644 index 00000000000..db62ca731b8 Binary files /dev/null and b/companion/src/themes/classic/16/folder-tree-read.png differ diff --git a/companion/src/themes/classic/16/folder-tree-write.png b/companion/src/themes/classic/16/folder-tree-write.png new file mode 100644 index 00000000000..92604f36fc0 Binary files /dev/null and b/companion/src/themes/classic/16/folder-tree-write.png differ diff --git a/companion/src/themes/classic/24/folder-tree-read.png b/companion/src/themes/classic/24/folder-tree-read.png new file mode 100644 index 00000000000..04d42a07dfd Binary files /dev/null and b/companion/src/themes/classic/24/folder-tree-read.png differ diff --git a/companion/src/themes/classic/24/folder-tree-write.png b/companion/src/themes/classic/24/folder-tree-write.png new file mode 100644 index 00000000000..b19006030b4 Binary files /dev/null and b/companion/src/themes/classic/24/folder-tree-write.png differ diff --git a/companion/src/themes/classic/32/folder-tree-read.png b/companion/src/themes/classic/32/folder-tree-read.png new file mode 100644 index 00000000000..496754b5cda Binary files /dev/null and b/companion/src/themes/classic/32/folder-tree-read.png differ diff --git a/companion/src/themes/classic/32/folder-tree-write.png b/companion/src/themes/classic/32/folder-tree-write.png new file mode 100644 index 00000000000..4d0ec832334 Binary files /dev/null and b/companion/src/themes/classic/32/folder-tree-write.png differ diff --git a/companion/src/themes/classic/48/folder-tree-read.png b/companion/src/themes/classic/48/folder-tree-read.png new file mode 100644 index 00000000000..6f1a5e6b0c9 Binary files /dev/null and b/companion/src/themes/classic/48/folder-tree-read.png differ diff --git a/companion/src/themes/classic/48/folder-tree-write.png b/companion/src/themes/classic/48/folder-tree-write.png new file mode 100644 index 00000000000..c6b5fb0ef32 Binary files /dev/null and b/companion/src/themes/classic/48/folder-tree-write.png differ diff --git a/companion/src/themes/monoblue/16/folder-tree-read.png b/companion/src/themes/monoblue/16/folder-tree-read.png new file mode 100644 index 00000000000..db62ca731b8 Binary files /dev/null and b/companion/src/themes/monoblue/16/folder-tree-read.png differ diff --git a/companion/src/themes/monoblue/16/folder-tree-write.png b/companion/src/themes/monoblue/16/folder-tree-write.png new file mode 100644 index 00000000000..92604f36fc0 Binary files /dev/null and b/companion/src/themes/monoblue/16/folder-tree-write.png differ diff --git a/companion/src/themes/monoblue/24/folder-tree-read.png b/companion/src/themes/monoblue/24/folder-tree-read.png new file mode 100644 index 00000000000..04d42a07dfd Binary files /dev/null and b/companion/src/themes/monoblue/24/folder-tree-read.png differ diff --git a/companion/src/themes/monoblue/24/folder-tree-write.png b/companion/src/themes/monoblue/24/folder-tree-write.png new file mode 100644 index 00000000000..b19006030b4 Binary files /dev/null and b/companion/src/themes/monoblue/24/folder-tree-write.png differ diff --git a/companion/src/themes/monoblue/32/folder-tree-read.png b/companion/src/themes/monoblue/32/folder-tree-read.png new file mode 100644 index 00000000000..496754b5cda Binary files /dev/null and b/companion/src/themes/monoblue/32/folder-tree-read.png differ diff --git a/companion/src/themes/monoblue/32/folder-tree-write.png b/companion/src/themes/monoblue/32/folder-tree-write.png new file mode 100644 index 00000000000..4d0ec832334 Binary files /dev/null and b/companion/src/themes/monoblue/32/folder-tree-write.png differ diff --git a/companion/src/themes/monoblue/48/folder-tree-read.png b/companion/src/themes/monoblue/48/folder-tree-read.png new file mode 100644 index 00000000000..6f1a5e6b0c9 Binary files /dev/null and b/companion/src/themes/monoblue/48/folder-tree-read.png differ diff --git a/companion/src/themes/monoblue/48/folder-tree-write.png b/companion/src/themes/monoblue/48/folder-tree-write.png new file mode 100644 index 00000000000..c6b5fb0ef32 Binary files /dev/null and b/companion/src/themes/monoblue/48/folder-tree-write.png differ diff --git a/companion/src/themes/monochrome/16/folder-tree-read.png b/companion/src/themes/monochrome/16/folder-tree-read.png new file mode 100644 index 00000000000..db62ca731b8 Binary files /dev/null and b/companion/src/themes/monochrome/16/folder-tree-read.png differ diff --git a/companion/src/themes/monochrome/16/folder-tree-write.png b/companion/src/themes/monochrome/16/folder-tree-write.png new file mode 100644 index 00000000000..92604f36fc0 Binary files /dev/null and b/companion/src/themes/monochrome/16/folder-tree-write.png differ diff --git a/companion/src/themes/monochrome/24/folder-tree-read.png b/companion/src/themes/monochrome/24/folder-tree-read.png new file mode 100644 index 00000000000..04d42a07dfd Binary files /dev/null and b/companion/src/themes/monochrome/24/folder-tree-read.png differ diff --git a/companion/src/themes/monochrome/24/folder-tree-write.png b/companion/src/themes/monochrome/24/folder-tree-write.png new file mode 100644 index 00000000000..b19006030b4 Binary files /dev/null and b/companion/src/themes/monochrome/24/folder-tree-write.png differ diff --git a/companion/src/themes/monochrome/32/folder-tree-read.png b/companion/src/themes/monochrome/32/folder-tree-read.png new file mode 100644 index 00000000000..496754b5cda Binary files /dev/null and b/companion/src/themes/monochrome/32/folder-tree-read.png differ diff --git a/companion/src/themes/monochrome/32/folder-tree-write.png b/companion/src/themes/monochrome/32/folder-tree-write.png new file mode 100644 index 00000000000..4d0ec832334 Binary files /dev/null and b/companion/src/themes/monochrome/32/folder-tree-write.png differ diff --git a/companion/src/themes/monochrome/48/folder-tree-read.png b/companion/src/themes/monochrome/48/folder-tree-read.png new file mode 100644 index 00000000000..6f1a5e6b0c9 Binary files /dev/null and b/companion/src/themes/monochrome/48/folder-tree-read.png differ diff --git a/companion/src/themes/monochrome/48/folder-tree-write.png b/companion/src/themes/monochrome/48/folder-tree-write.png new file mode 100644 index 00000000000..c6b5fb0ef32 Binary files /dev/null and b/companion/src/themes/monochrome/48/folder-tree-write.png differ diff --git a/companion/src/themes/monowhite/16/folder-tree-read.png b/companion/src/themes/monowhite/16/folder-tree-read.png new file mode 100644 index 00000000000..db62ca731b8 Binary files /dev/null and b/companion/src/themes/monowhite/16/folder-tree-read.png differ diff --git a/companion/src/themes/monowhite/16/folder-tree-write.png b/companion/src/themes/monowhite/16/folder-tree-write.png new file mode 100644 index 00000000000..92604f36fc0 Binary files /dev/null and b/companion/src/themes/monowhite/16/folder-tree-write.png differ diff --git a/companion/src/themes/monowhite/24/folder-tree-read.png b/companion/src/themes/monowhite/24/folder-tree-read.png new file mode 100644 index 00000000000..04d42a07dfd Binary files /dev/null and b/companion/src/themes/monowhite/24/folder-tree-read.png differ diff --git a/companion/src/themes/monowhite/24/folder-tree-write.png b/companion/src/themes/monowhite/24/folder-tree-write.png new file mode 100644 index 00000000000..b19006030b4 Binary files /dev/null and b/companion/src/themes/monowhite/24/folder-tree-write.png differ diff --git a/companion/src/themes/monowhite/32/folder-tree-read.png b/companion/src/themes/monowhite/32/folder-tree-read.png new file mode 100644 index 00000000000..496754b5cda Binary files /dev/null and b/companion/src/themes/monowhite/32/folder-tree-read.png differ diff --git a/companion/src/themes/monowhite/32/folder-tree-write.png b/companion/src/themes/monowhite/32/folder-tree-write.png new file mode 100644 index 00000000000..4d0ec832334 Binary files /dev/null and b/companion/src/themes/monowhite/32/folder-tree-write.png differ diff --git a/companion/src/themes/monowhite/48/folder-tree-read.png b/companion/src/themes/monowhite/48/folder-tree-read.png new file mode 100644 index 00000000000..6f1a5e6b0c9 Binary files /dev/null and b/companion/src/themes/monowhite/48/folder-tree-read.png differ diff --git a/companion/src/themes/monowhite/48/folder-tree-write.png b/companion/src/themes/monowhite/48/folder-tree-write.png new file mode 100644 index 00000000000..c6b5fb0ef32 Binary files /dev/null and b/companion/src/themes/monowhite/48/folder-tree-write.png differ diff --git a/companion/src/themes/yerico/16/folder-tree-read.png b/companion/src/themes/yerico/16/folder-tree-read.png new file mode 100644 index 00000000000..db62ca731b8 Binary files /dev/null and b/companion/src/themes/yerico/16/folder-tree-read.png differ diff --git a/companion/src/themes/yerico/16/folder-tree-write.png b/companion/src/themes/yerico/16/folder-tree-write.png new file mode 100644 index 00000000000..92604f36fc0 Binary files /dev/null and b/companion/src/themes/yerico/16/folder-tree-write.png differ diff --git a/companion/src/themes/yerico/24/folder-tree-read.png b/companion/src/themes/yerico/24/folder-tree-read.png new file mode 100644 index 00000000000..04d42a07dfd Binary files /dev/null and b/companion/src/themes/yerico/24/folder-tree-read.png differ diff --git a/companion/src/themes/yerico/24/folder-tree-write.png b/companion/src/themes/yerico/24/folder-tree-write.png new file mode 100644 index 00000000000..b19006030b4 Binary files /dev/null and b/companion/src/themes/yerico/24/folder-tree-write.png differ diff --git a/companion/src/themes/yerico/32/folder-tree-read.png b/companion/src/themes/yerico/32/folder-tree-read.png new file mode 100644 index 00000000000..496754b5cda Binary files /dev/null and b/companion/src/themes/yerico/32/folder-tree-read.png differ diff --git a/companion/src/themes/yerico/32/folder-tree-write.png b/companion/src/themes/yerico/32/folder-tree-write.png new file mode 100644 index 00000000000..4d0ec832334 Binary files /dev/null and b/companion/src/themes/yerico/32/folder-tree-write.png differ diff --git a/companion/src/themes/yerico/48/folder-tree-read.png b/companion/src/themes/yerico/48/folder-tree-read.png new file mode 100644 index 00000000000..6f1a5e6b0c9 Binary files /dev/null and b/companion/src/themes/yerico/48/folder-tree-read.png differ diff --git a/companion/src/themes/yerico/48/folder-tree-write.png b/companion/src/themes/yerico/48/folder-tree-write.png new file mode 100644 index 00000000000..c6b5fb0ef32 Binary files /dev/null and b/companion/src/themes/yerico/48/folder-tree-write.png differ