diff --git a/tests/menus_correct/blackbox b/tests/menus_correct/blackbox index 37d85a4..0b08e53 100644 --- a/tests/menus_correct/blackbox +++ b/tests/menus_correct/blackbox @@ -22,7 +22,6 @@ [exec] (RStudio) {/usr/lib64/rstudio/bin/rstudio } [end] # (Development) [submenu] (Education) - [exec] (LibreOffice 4.4 Math) {libreoffice4.4 --math } [exec] (R) {xterm -e R} [end] # (Education) [submenu] (Games) @@ -34,7 +33,6 @@ [exec] (GNU Image Manipulation Program) {gimp-2.8 } [exec] (Gcolor2) {gcolor2} [exec] (LRF Viewer) {lrfviewer } - [exec] (LibreOffice 4.4 Draw) {libreoffice4.4 --draw } [exec] (Simple Scan) {simple-scan} [exec] (Viewnior) {viewnior } [end] # (Graphics) @@ -62,7 +60,9 @@ [exec] (HTMLDOC) {htmldoc } [exec] (LibreOffice 4.4 Base) {libreoffice4.4 --base } [exec] (LibreOffice 4.4 Calc) {libreoffice4.4 --calc } + [exec] (LibreOffice 4.4 Draw) {libreoffice4.4 --draw } [exec] (LibreOffice 4.4 Impress) {libreoffice4.4 --impress } + [exec] (LibreOffice 4.4 Math) {libreoffice4.4 --math } [exec] (LibreOffice 4.4 Writer) {libreoffice4.4 --writer } [exec] (calibre) {calibre } [end] # (Office) diff --git a/tests/menus_correct/compizboxmenu b/tests/menus_correct/compizboxmenu index b37d2ea..bde98ef 100644 --- a/tests/menus_correct/compizboxmenu +++ b/tests/menus_correct/compizboxmenu @@ -22,7 +22,6 @@ RStudio/usr/lib64/rstudio/bin/rstudio - LibreOffice 4.4 Mathlibreoffice4.4 --math Rxterm -e R @@ -34,7 +33,6 @@ GNU Image Manipulation Programgimp-2.8 Gcolor2gcolor2 LRF Viewerlrfviewer - LibreOffice 4.4 Drawlibreoffice4.4 --draw Simple Scansimple-scan Viewniorviewnior @@ -62,7 +60,9 @@ HTMLDOChtmldoc LibreOffice 4.4 Baselibreoffice4.4 --base LibreOffice 4.4 Calclibreoffice4.4 --calc + LibreOffice 4.4 Drawlibreoffice4.4 --draw LibreOffice 4.4 Impresslibreoffice4.4 --impress + LibreOffice 4.4 Mathlibreoffice4.4 --math LibreOffice 4.4 Writerlibreoffice4.4 --writer calibrecalibre diff --git a/tests/menus_correct/compizboxmenu_icons b/tests/menus_correct/compizboxmenu_icons index 708ffa5..7243159 100644 --- a/tests/menus_correct/compizboxmenu_icons +++ b/tests/menus_correct/compizboxmenu_icons @@ -22,7 +22,6 @@ RStudiorstudio/usr/lib64/rstudio/bin/rstudio - LibreOffice 4.4 Mathlibreoffice4.4-mathlibreoffice4.4 --math RRxterm -e R @@ -34,7 +33,6 @@ GNU Image Manipulation Programgimpgimp-2.8 Gcolor2gcolor2gcolor2 LRF Viewercalibre-viewerlrfviewer - LibreOffice 4.4 Drawlibreoffice4.4-drawlibreoffice4.4 --draw Simple Scanscannersimple-scan Viewniorviewniorviewnior @@ -62,7 +60,9 @@ HTMLDOChtmldochtmldoc LibreOffice 4.4 Baselibreoffice4.4-baselibreoffice4.4 --base LibreOffice 4.4 Calclibreoffice4.4-calclibreoffice4.4 --calc + LibreOffice 4.4 Drawlibreoffice4.4-drawlibreoffice4.4 --draw LibreOffice 4.4 Impresslibreoffice4.4-impresslibreoffice4.4 --impress + LibreOffice 4.4 Mathlibreoffice4.4-mathlibreoffice4.4 --math LibreOffice 4.4 Writerlibreoffice4.4-writerlibreoffice4.4 --writer calibrecalibre-guicalibre diff --git a/tests/menus_correct/fluxbox b/tests/menus_correct/fluxbox index 37d85a4..0b08e53 100644 --- a/tests/menus_correct/fluxbox +++ b/tests/menus_correct/fluxbox @@ -22,7 +22,6 @@ [exec] (RStudio) {/usr/lib64/rstudio/bin/rstudio } [end] # (Development) [submenu] (Education) - [exec] (LibreOffice 4.4 Math) {libreoffice4.4 --math } [exec] (R) {xterm -e R} [end] # (Education) [submenu] (Games) @@ -34,7 +33,6 @@ [exec] (GNU Image Manipulation Program) {gimp-2.8 } [exec] (Gcolor2) {gcolor2} [exec] (LRF Viewer) {lrfviewer } - [exec] (LibreOffice 4.4 Draw) {libreoffice4.4 --draw } [exec] (Simple Scan) {simple-scan} [exec] (Viewnior) {viewnior } [end] # (Graphics) @@ -62,7 +60,9 @@ [exec] (HTMLDOC) {htmldoc } [exec] (LibreOffice 4.4 Base) {libreoffice4.4 --base } [exec] (LibreOffice 4.4 Calc) {libreoffice4.4 --calc } + [exec] (LibreOffice 4.4 Draw) {libreoffice4.4 --draw } [exec] (LibreOffice 4.4 Impress) {libreoffice4.4 --impress } + [exec] (LibreOffice 4.4 Math) {libreoffice4.4 --math } [exec] (LibreOffice 4.4 Writer) {libreoffice4.4 --writer } [exec] (calibre) {calibre } [end] # (Office) diff --git a/tests/menus_correct/fluxbox_el b/tests/menus_correct/fluxbox_el index cb96e91..7ea196f 100644 --- a/tests/menus_correct/fluxbox_el +++ b/tests/menus_correct/fluxbox_el @@ -25,7 +25,9 @@ [exec] (HTMLDOC) {htmldoc } [exec] (LibreOffice 4.4 Base) {libreoffice4.4 --base } [exec] (LibreOffice 4.4 Calc) {libreoffice4.4 --calc } + [exec] (LibreOffice 4.4 Draw) {libreoffice4.4 --draw } [exec] (LibreOffice 4.4 Impress) {libreoffice4.4 --impress } + [exec] (LibreOffice 4.4 Math) {libreoffice4.4 --math } [exec] (LibreOffice 4.4 Writer) {libreoffice4.4 --writer } [exec] (calibre) {calibre } [exec] (Εφαρμογή προβολής εγγράφων Atril) {atril } @@ -35,7 +37,6 @@ [exec] (E-book Viewer) {ebook-viewer } [exec] (Gcolor2) {gcolor2} [exec] (LRF Viewer) {lrfviewer } - [exec] (LibreOffice 4.4 Draw) {libreoffice4.4 --draw } [exec] (Viewnior) {viewnior } [exec] (Επεξεργαστής διαγραμμάτων Dia) {dia } [exec] (Πρόγραμμα επεξεργασίας εικόνων GNU) {gimp-2.8 } @@ -50,7 +51,6 @@ [exec] (Αποστολέας μηνυμάτων διαδικτύου Pidgin) {pidgin} [end] # (Δίκτυο) [submenu] (Εκπαίδευση) - [exec] (LibreOffice 4.4 Math) {libreoffice4.4 --math } [exec] (R) {xterm -e R} [end] # (Εκπαίδευση) [submenu] (Παιχνίδια) diff --git a/tests/menus_correct/fluxbox_icons b/tests/menus_correct/fluxbox_icons index f611cf0..0dac0ef 100644 --- a/tests/menus_correct/fluxbox_icons +++ b/tests/menus_correct/fluxbox_icons @@ -1,89 +1,89 @@ [submenu] (Applications) - [submenu] (Accessories) + [submenu] (Accessories) [exec] (Engrampa Archive Manager) {engrampa } [exec] (GTKMan Manual Page Viewer) {gtkman salix} [exec] (Galculator) {galculator} [exec] (KeePassX) {keepassx } [exec] (Leafpad) {leafpad } - [exec] (Search for Files...) {mate-search-tool} - [exec] (Take Screenshot) {mate-screenshot --interactive} + [exec] (Search for Files...) {mate-search-tool} + [exec] (Take Screenshot) {mate-screenshot --interactive} [exec] (Xournal) {xournal } - [exec] (Zim Desktop Wiki) {zim} + [exec] (Zim Desktop Wiki) {zim} [end] # (Accessories) - [submenu] (Development) - [exec] (CMake) {cmake-gui } - [exec] (Geany) {geany } + [submenu] (Development) + [exec] (CMake) {cmake-gui } + [exec] (Geany) {geany } [exec] (Glade) {glade-3 } - [exec] (Meld) {meld } + [exec] (Meld) {meld } [exec] (Poedit) {poedit } [exec] (Qt4 Assistant) {assistant} [exec] (Qt4 Designer) {designer} [exec] (Qt4 Linguist) {linguist} - [exec] (RStudio) {/usr/lib64/rstudio/bin/rstudio } + [exec] (RStudio) {/usr/lib64/rstudio/bin/rstudio } [end] # (Development) [submenu] (Education) - [exec] (LibreOffice 4.4 Math) {libreoffice4.4 --math } [exec] (R) {xterm -e R} [end] # (Education) - [submenu] (Games) - [exec] (KEGS) {xterm -e aoss xkegs} + [submenu] (Games) + [exec] (KEGS) {xterm -e aoss xkegs} [end] # (Games) [submenu] (Graphics) - [exec] (Dia Diagram Editor) {dia } - [exec] (E-book Viewer) {ebook-viewer } + [exec] (Dia Diagram Editor) {dia } + [exec] (E-book Viewer) {ebook-viewer } [exec] (GNU Image Manipulation Program) {gimp-2.8 } - [exec] (Gcolor2) {gcolor2} - [exec] (LRF Viewer) {lrfviewer } - [exec] (LibreOffice 4.4 Draw) {libreoffice4.4 --draw } + [exec] (Gcolor2) {gcolor2} + [exec] (LRF Viewer) {lrfviewer } [exec] (Simple Scan) {simple-scan} [exec] (Viewnior) {viewnior } [end] # (Graphics) - [submenu] (Multimedia) - [exec] (Asunder CD Ripper) {asunder} - [exec] (Audacity) {audacity } + [submenu] (Multimedia) + [exec] (Asunder CD Ripper) {asunder} + [exec] (Audacity) {audacity } [exec] (Ex Falso) {exfalso} - [exec] (Exaile) {exaile } - [exec] (GNOME MPlayer) {gnome-mplayer } + [exec] (Exaile) {exaile } + [exec] (GNOME MPlayer) {gnome-mplayer } [exec] (Gaupol) {gaupol } - [exec] (ISO Master) {isomaster} + [exec] (ISO Master) {isomaster} [exec] (Quod Libet) {quodlibet} [end] # (Multimedia) - [submenu] (Network) - [exec] (Claws Mail) {claws-mail } + [submenu] (Network) + [exec] (Claws Mail) {claws-mail } [exec] (Firefox) {firefox } - [exec] (Pidgin Internet Messenger) {pidgin} + [exec] (Pidgin Internet Messenger) {pidgin} [exec] (Transmission) {transmission-gtk } - [exec] (gFTP) {gftp } + [exec] (gFTP) {gftp } [exec] (ownCloud desktop sync client) {/usr/bin/owncloud} [end] # (Network) - [submenu] (Office) + [submenu] (Office) [exec] (Atril Document Viewer) {atril } [exec] (Dictionary) {mate-dictionary} - [exec] (HTMLDOC) {htmldoc } - [exec] (LibreOffice 4.4 Base) {libreoffice4.4 --base } - [exec] (LibreOffice 4.4 Calc) {libreoffice4.4 --calc } - [exec] (LibreOffice 4.4 Impress) {libreoffice4.4 --impress } - [exec] (LibreOffice 4.4 Writer) {libreoffice4.4 --writer } - [exec] (calibre) {calibre } + [exec] (HTMLDOC) {htmldoc } + [exec] (LibreOffice 4.4 Base) {libreoffice4.4 --base } + [exec] (LibreOffice 4.4 Calc) {libreoffice4.4 --calc } + [exec] (LibreOffice 4.4 Draw) {libreoffice4.4 --draw } + [exec] (LibreOffice 4.4 Impress) {libreoffice4.4 --impress } + [exec] (LibreOffice 4.4 Math) {libreoffice4.4 --math } + [exec] (LibreOffice 4.4 Writer) {libreoffice4.4 --writer } + [exec] (calibre) {calibre } [end] # (Office) - [submenu] (Settings) + [submenu] (Settings) [exec] (Bluetooth Manager) {blueman-manager} [exec] (Power Management) {mate-power-preferences} - [exec] (Qt4 Config) {qtconfig} - [exec] (Screensaver) {xscreensaver-demo} + [exec] (Qt4 Config) {qtconfig} + [exec] (Screensaver) {xscreensaver-demo} [end] # (Settings) - [submenu] (System) - [exec] (ALSA sound card) {gksu gtkalsasetup} + [submenu] (System) + [exec] (ALSA sound card) {gksu gtkalsasetup} [exec] (Disk Usage Analyzer) {mate-disk-usage-analyzer} [exec] (Dotnew) {gksu dotnew-gtk} [exec] (Grsync) {/usr/bin/grsync -i } [exec] (Gslapt Package Manager) {gksu /usr/sbin/gslapt} [exec] (Hostnames) {gksu gtkhostsetup} - [exec] (Htop) {xterm -e htop} + [exec] (Htop) {xterm -e htop} [exec] (Keyboard) {gksu gtkkeyboardsetup} [exec] (Log File Viewer) {mate-system-log} - [exec] (MATE Terminal) {mate-terminal} - [exec] (Manage Printing) {/usr/bin/xdg-open http://localhost:631/} + [exec] (MATE Terminal) {mate-terminal} + [exec] (Manage Printing) {/usr/bin/xdg-open http://localhost:631/} [exec] (Power Statistics) {mate-power-statistics} [exec] (Sourcery SlackBuild Manager) {gksu sourcery} [exec] (System clock) {gksu gtkclocksetup} diff --git a/tests/menus_correct/fluxbox_icons48 b/tests/menus_correct/fluxbox_icons48 index c21b930..c00ff76 100644 --- a/tests/menus_correct/fluxbox_icons48 +++ b/tests/menus_correct/fluxbox_icons48 @@ -1,20 +1,20 @@ [submenu] (Applications) - [submenu] (Accessories) + [submenu] (Accessories) [exec] (Engrampa Archive Manager) {engrampa } [exec] (GTKMan Manual Page Viewer) {gtkman salix} [exec] (Galculator) {galculator} [exec] (KeePassX) {keepassx } [exec] (Leafpad) {leafpad } - [exec] (Search for Files...) {mate-search-tool} - [exec] (Take Screenshot) {mate-screenshot --interactive} + [exec] (Search for Files...) {mate-search-tool} + [exec] (Take Screenshot) {mate-screenshot --interactive} [exec] (Xournal) {xournal } - [exec] (Zim Desktop Wiki) {zim} + [exec] (Zim Desktop Wiki) {zim} [end] # (Accessories) - [submenu] (Development) - [exec] (CMake) {cmake-gui } - [exec] (Geany) {geany } + [submenu] (Development) + [exec] (CMake) {cmake-gui } + [exec] (Geany) {geany } [exec] (Glade) {glade-3 } - [exec] (Meld) {meld } + [exec] (Meld) {meld } [exec] (Poedit) {poedit } [exec] (Qt4 Assistant) {assistant} [exec] (Qt4 Designer) {designer} @@ -22,68 +22,68 @@ [exec] (RStudio) {/usr/lib64/rstudio/bin/rstudio } [end] # (Development) [submenu] (Education) - [exec] (LibreOffice 4.4 Math) {libreoffice4.4 --math } [exec] (R) {xterm -e R} [end] # (Education) - [submenu] (Games) - [exec] (KEGS) {xterm -e aoss xkegs} + [submenu] (Games) + [exec] (KEGS) {xterm -e aoss xkegs} [end] # (Games) [submenu] (Graphics) - [exec] (Dia Diagram Editor) {dia } - [exec] (E-book Viewer) {ebook-viewer } + [exec] (Dia Diagram Editor) {dia } + [exec] (E-book Viewer) {ebook-viewer } [exec] (GNU Image Manipulation Program) {gimp-2.8 } - [exec] (Gcolor2) {gcolor2} - [exec] (LRF Viewer) {lrfviewer } - [exec] (LibreOffice 4.4 Draw) {libreoffice4.4 --draw } + [exec] (Gcolor2) {gcolor2} + [exec] (LRF Viewer) {lrfviewer } [exec] (Simple Scan) {simple-scan} [exec] (Viewnior) {viewnior } [end] # (Graphics) - [submenu] (Multimedia) - [exec] (Asunder CD Ripper) {asunder} - [exec] (Audacity) {audacity } + [submenu] (Multimedia) + [exec] (Asunder CD Ripper) {asunder} + [exec] (Audacity) {audacity } [exec] (Ex Falso) {exfalso} - [exec] (Exaile) {exaile } - [exec] (GNOME MPlayer) {gnome-mplayer } + [exec] (Exaile) {exaile } + [exec] (GNOME MPlayer) {gnome-mplayer } [exec] (Gaupol) {gaupol } - [exec] (ISO Master) {isomaster} + [exec] (ISO Master) {isomaster} [exec] (Quod Libet) {quodlibet} [end] # (Multimedia) - [submenu] (Network) - [exec] (Claws Mail) {claws-mail } + [submenu] (Network) + [exec] (Claws Mail) {claws-mail } [exec] (Firefox) {firefox } - [exec] (Pidgin Internet Messenger) {pidgin} + [exec] (Pidgin Internet Messenger) {pidgin} [exec] (Transmission) {transmission-gtk } - [exec] (gFTP) {gftp } + [exec] (gFTP) {gftp } [exec] (ownCloud desktop sync client) {/usr/bin/owncloud} [end] # (Network) - [submenu] (Office) + [submenu] (Office) [exec] (Atril Document Viewer) {atril } [exec] (Dictionary) {mate-dictionary} - [exec] (HTMLDOC) {htmldoc } - [exec] (LibreOffice 4.4 Base) {libreoffice4.4 --base } - [exec] (LibreOffice 4.4 Calc) {libreoffice4.4 --calc } - [exec] (LibreOffice 4.4 Impress) {libreoffice4.4 --impress } - [exec] (LibreOffice 4.4 Writer) {libreoffice4.4 --writer } - [exec] (calibre) {calibre } + [exec] (HTMLDOC) {htmldoc } + [exec] (LibreOffice 4.4 Base) {libreoffice4.4 --base } + [exec] (LibreOffice 4.4 Calc) {libreoffice4.4 --calc } + [exec] (LibreOffice 4.4 Draw) {libreoffice4.4 --draw } + [exec] (LibreOffice 4.4 Impress) {libreoffice4.4 --impress } + [exec] (LibreOffice 4.4 Math) {libreoffice4.4 --math } + [exec] (LibreOffice 4.4 Writer) {libreoffice4.4 --writer } + [exec] (calibre) {calibre } [end] # (Office) - [submenu] (Settings) + [submenu] (Settings) [exec] (Bluetooth Manager) {blueman-manager} [exec] (Power Management) {mate-power-preferences} - [exec] (Qt4 Config) {qtconfig} - [exec] (Screensaver) {xscreensaver-demo} + [exec] (Qt4 Config) {qtconfig} + [exec] (Screensaver) {xscreensaver-demo} [end] # (Settings) - [submenu] (System) - [exec] (ALSA sound card) {gksu gtkalsasetup} + [submenu] (System) + [exec] (ALSA sound card) {gksu gtkalsasetup} [exec] (Disk Usage Analyzer) {mate-disk-usage-analyzer} [exec] (Dotnew) {gksu dotnew-gtk} [exec] (Grsync) {/usr/bin/grsync -i } [exec] (Gslapt Package Manager) {gksu /usr/sbin/gslapt} [exec] (Hostnames) {gksu gtkhostsetup} - [exec] (Htop) {xterm -e htop} + [exec] (Htop) {xterm -e htop} [exec] (Keyboard) {gksu gtkkeyboardsetup} [exec] (Log File Viewer) {mate-system-log} - [exec] (MATE Terminal) {mate-terminal} - [exec] (Manage Printing) {/usr/bin/xdg-open http://localhost:631/} + [exec] (MATE Terminal) {mate-terminal} + [exec] (Manage Printing) {/usr/bin/xdg-open http://localhost:631/} [exec] (Power Statistics) {mate-power-statistics} [exec] (Sourcery SlackBuild Manager) {gksu sourcery} [exec] (System clock) {gksu gtkclocksetup} diff --git a/tests/menus_correct/fluxbox_nosubmenu b/tests/menus_correct/fluxbox_nosubmenu index 5bcb01b..5a75479 100644 --- a/tests/menus_correct/fluxbox_nosubmenu +++ b/tests/menus_correct/fluxbox_nosubmenu @@ -21,7 +21,6 @@ [exec] (RStudio) {/usr/lib64/rstudio/bin/rstudio } [end] # (Development) [submenu] (Education) - [exec] (LibreOffice 4.4 Math) {libreoffice4.4 --math } [exec] (R) {xterm -e R} [end] # (Education) [submenu] (Games) @@ -33,7 +32,6 @@ [exec] (GNU Image Manipulation Program) {gimp-2.8 } [exec] (Gcolor2) {gcolor2} [exec] (LRF Viewer) {lrfviewer } - [exec] (LibreOffice 4.4 Draw) {libreoffice4.4 --draw } [exec] (Simple Scan) {simple-scan} [exec] (Viewnior) {viewnior } [end] # (Graphics) @@ -61,7 +59,9 @@ [exec] (HTMLDOC) {htmldoc } [exec] (LibreOffice 4.4 Base) {libreoffice4.4 --base } [exec] (LibreOffice 4.4 Calc) {libreoffice4.4 --calc } + [exec] (LibreOffice 4.4 Draw) {libreoffice4.4 --draw } [exec] (LibreOffice 4.4 Impress) {libreoffice4.4 --impress } + [exec] (LibreOffice 4.4 Math) {libreoffice4.4 --math } [exec] (LibreOffice 4.4 Writer) {libreoffice4.4 --writer } [exec] (calibre) {calibre } [end] # (Office) diff --git a/tests/menus_correct/fvwm b/tests/menus_correct/fvwm index 09a2fc2..02dd856 100644 --- a/tests/menus_correct/fvwm +++ b/tests/menus_correct/fvwm @@ -40,7 +40,6 @@ AddToMenu "Development" DestroyMenu "Education" AddToMenu "Education" + "Education" Title -+ "LibreOffice 4.4 Math" Exec libreoffice4.4 --math + "R" Exec xterm -e R DestroyMenu "Games" @@ -56,7 +55,6 @@ AddToMenu "Graphics" + "GNU Image Manipulation Program" Exec gimp-2.8 + "Gcolor2" Exec gcolor2 + "LRF Viewer" Exec lrfviewer -+ "LibreOffice 4.4 Draw" Exec libreoffice4.4 --draw + "Simple Scan" Exec simple-scan + "Viewnior" Exec viewnior @@ -90,7 +88,9 @@ AddToMenu "Office" + "HTMLDOC" Exec htmldoc + "LibreOffice 4.4 Base" Exec libreoffice4.4 --base + "LibreOffice 4.4 Calc" Exec libreoffice4.4 --calc ++ "LibreOffice 4.4 Draw" Exec libreoffice4.4 --draw + "LibreOffice 4.4 Impress" Exec libreoffice4.4 --impress ++ "LibreOffice 4.4 Math" Exec libreoffice4.4 --math + "LibreOffice 4.4 Writer" Exec libreoffice4.4 --writer + "calibre" Exec calibre diff --git a/tests/menus_correct/icewm b/tests/menus_correct/icewm index b6edec2..b7b128d 100644 --- a/tests/menus_correct/icewm +++ b/tests/menus_correct/icewm @@ -22,7 +22,6 @@ menu "Applications" _none_ { prog "RStudio" _none_ /usr/lib64/rstudio/bin/rstudio } menu "Education" _none_ { - prog "LibreOffice 4.4 Math" _none_ libreoffice4.4 --math prog "R" _none_ xterm -e R } menu "Games" _none_ { @@ -34,7 +33,6 @@ menu "Applications" _none_ { prog "GNU Image Manipulation Program" _none_ gimp-2.8 prog "Gcolor2" _none_ gcolor2 prog "LRF Viewer" _none_ lrfviewer - prog "LibreOffice 4.4 Draw" _none_ libreoffice4.4 --draw prog "Simple Scan" _none_ simple-scan prog "Viewnior" _none_ viewnior } @@ -62,7 +60,9 @@ menu "Applications" _none_ { prog "HTMLDOC" _none_ htmldoc prog "LibreOffice 4.4 Base" _none_ libreoffice4.4 --base prog "LibreOffice 4.4 Calc" _none_ libreoffice4.4 --calc + prog "LibreOffice 4.4 Draw" _none_ libreoffice4.4 --draw prog "LibreOffice 4.4 Impress" _none_ libreoffice4.4 --impress + prog "LibreOffice 4.4 Math" _none_ libreoffice4.4 --math prog "LibreOffice 4.4 Writer" _none_ libreoffice4.4 --writer prog "calibre" _none_ calibre } diff --git a/tests/menus_correct/icewm_de b/tests/menus_correct/icewm_de index 0e82212..12e06fa 100644 --- a/tests/menus_correct/icewm_de +++ b/tests/menus_correct/icewm_de @@ -1,6 +1,5 @@ menu "Anwendungen" _none_ { menu "Bildung" _none_ { - prog "LibreOffice 4.4 Math" _none_ libreoffice4.4 --math prog "R" _none_ xterm -e R } menu "Büro" _none_ { @@ -8,7 +7,9 @@ menu "Anwendungen" _none_ { prog "HTMLDOC" _none_ htmldoc prog "LibreOffice 4.4 Base" _none_ libreoffice4.4 --base prog "LibreOffice 4.4 Calc" _none_ libreoffice4.4 --calc + prog "LibreOffice 4.4 Draw" _none_ libreoffice4.4 --draw prog "LibreOffice 4.4 Impress" _none_ libreoffice4.4 --impress + prog "LibreOffice 4.4 Math" _none_ libreoffice4.4 --math prog "LibreOffice 4.4 Writer" _none_ libreoffice4.4 --writer prog "Wörterbuch" _none_ mate-dictionary prog "calibre" _none_ calibre @@ -36,7 +37,6 @@ menu "Anwendungen" _none_ { prog "GNU Image Manipulation Program" _none_ gimp-2.8 prog "Gcolor2" _none_ gcolor2 prog "LRF Viewer" _none_ lrfviewer - prog "LibreOffice 4.4 Draw" _none_ libreoffice4.4 --draw prog "Simple Scan" _none_ simple-scan prog "Viewnior" _none_ viewnior } diff --git a/tests/menus_correct/icewm_icons b/tests/menus_correct/icewm_icons index 7e81cac..ffa6721 100644 --- a/tests/menus_correct/icewm_icons +++ b/tests/menus_correct/icewm_icons @@ -1,89 +1,89 @@ menu "Applications" /usr/share/icons/mate/16x16/categories/applications-other.png { - menu "Accessories" /usr/share/icons/mate-colors-common/16x16/categories/applications-accessories.png { + menu "Accessories" /usr/share/icons/mate/16x16/categories/applications-accessories.png { prog "Engrampa Archive Manager" /usr/share/icons/hicolor/16x16/apps/engrampa.png engrampa prog "GTKMan Manual Page Viewer" /usr/share/icons/hicolor/16x16/apps/gtkman.png gtkman salix prog "Galculator" /usr/share/icons/hicolor/48x48/apps/galculator.png galculator prog "KeePassX" /usr/share/pixmaps/keepassx.xpm keepassx prog "Leafpad" /usr/share/icons/hicolor/16x16/apps/leafpad.png leafpad - prog "Search for Files..." /usr/share/icons/mate-colors-common/16x16/actions/system-search.png mate-search-tool - prog "Take Screenshot" /usr/share/icons/mate-colors-common/16x16/devices/applets-screenshooter.png mate-screenshot --interactive + prog "Search for Files..." /usr/share/icons/mate/16x16/actions/system-search.png mate-search-tool + prog "Take Screenshot" /usr/share/icons/mate/16x16/apps/applets-screenshooter.png mate-screenshot --interactive prog "Xournal" _none_ xournal - prog "Zim Desktop Wiki" /usr/share/icons/mate-colors-common/16x16/apps/zim.png zim + prog "Zim Desktop Wiki" /usr/share/icons/hicolor/64x64/apps/zim.png zim } - menu "Development" /usr/share/icons/mate-colors-common/16x16/categories/applications-development.png { - prog "CMake" /usr/share/pixmaps/CMakeSetup32.png cmake-gui - prog "Geany" /usr/share/icons/mate-colors-common/16x16/apps/geany.png geany + menu "Development" /usr/share/icons/mate/16x16/categories/applications-development.png { + prog "CMake" _none_ cmake-gui + prog "Geany" /usr/share/icons/hicolor/16x16/apps/geany.png geany prog "Glade" /usr/share/icons/hicolor/16x16/apps/glade-3.png glade-3 - prog "Meld" /usr/share/icons/mate-colors-common/16x16/apps/meld.png meld + prog "Meld" /usr/share/icons/hicolor/16x16/apps/meld.png meld prog "Poedit" /usr/share/icons/hicolor/16x16/apps/poedit.png poedit prog "Qt4 Assistant" /usr/share/icons/hicolor/32x32/apps/assistant.png assistant prog "Qt4 Designer" /usr/share/icons/hicolor/128x128/apps/designer.png designer prog "Qt4 Linguist" /usr/share/icons/hicolor/16x16/apps/linguist.png linguist - prog "RStudio" /usr/share/icons/hicolor/16x16/apps/rstudio.png /usr/lib64/rstudio/bin/rstudio + prog "RStudio" /usr/share/icons/hicolor/48x48/apps/rstudio.png /usr/lib64/rstudio/bin/rstudio } menu "Education" _none_ { - prog "LibreOffice 4.4 Math" /usr/share/icons/hicolor/16x16/apps/libreoffice4.4-math.png libreoffice4.4 --math prog "R" /usr/share/icons/hicolor/16x16/apps/R.png xterm -e R } - menu "Games" /usr/share/icons/mate-colors-common/16x16/categories/applications-games.png { - prog "KEGS" /usr/share/pixmaps/kegs.png xterm -e aoss xkegs + menu "Games" /usr/share/icons/mate/16x16/categories/applications-games.png { + prog "KEGS" _none_ xterm -e aoss xkegs } menu "Graphics" /usr/share/icons/mate/16x16/categories/applications-graphics.png { - prog "Dia Diagram Editor" /usr/share/icons/mate-colors-common/16x16/apps/dia.png dia - prog "E-book Viewer" /usr/share/icons/hicolor/16x16/apps/calibre-viewer.png ebook-viewer + prog "Dia Diagram Editor" /usr/share/icons/hicolor/16x16/apps/dia.png dia + prog "E-book Viewer" _none_ ebook-viewer prog "GNU Image Manipulation Program" /usr/share/icons/hicolor/16x16/apps/gimp.png gimp-2.8 - prog "Gcolor2" /usr/share/icons/hicolor/16x16/apps/gcolor2.png gcolor2 - prog "LRF Viewer" /usr/share/icons/hicolor/16x16/apps/calibre-viewer.png lrfviewer - prog "LibreOffice 4.4 Draw" /usr/share/icons/hicolor/16x16/apps/libreoffice4.4-draw.png libreoffice4.4 --draw + prog "Gcolor2" /usr/share/icons/mate/16x16/apps/gcolor2.png gcolor2 + prog "LRF Viewer" _none_ lrfviewer prog "Simple Scan" /usr/share/icons/mate/16x16/devices/scanner.png simple-scan prog "Viewnior" /usr/share/icons/hicolor/16x16/apps/viewnior.png viewnior } - menu "Multimedia" /usr/share/icons/mate-colors-common/16x16/categories/applications-multimedia.png { - prog "Asunder CD Ripper" /usr/share/icons/hicolor/48x48/apps/asunder.png asunder - prog "Audacity" /usr/share/icons/mate-colors-common/16x16/apps/audacity.png audacity + menu "Multimedia" /usr/share/icons/mate/16x16/categories/applications-multimedia.png { + prog "Asunder CD Ripper" _none_ asunder + prog "Audacity" /usr/share/icons/hicolor/16x16/apps/audacity.png audacity prog "Ex Falso" /usr/share/icons/hicolor/64x64/apps/exfalso.png exfalso - prog "Exaile" /usr/share/icons/mate-colors-common/16x16/apps/exaile.png exaile - prog "GNOME MPlayer" /usr/share/icons/mate-colors-common/16x16/apps/gnome-mplayer.png gnome-mplayer + prog "Exaile" /usr/share/icons/hicolor/48x48/apps/exaile.png exaile + prog "GNOME MPlayer" _none_ gnome-mplayer prog "Gaupol" /usr/share/icons/hicolor/16x16/apps/gaupol.png gaupol - prog "ISO Master" /usr/share/icons/hicolor/16x16/apps/isomaster.png isomaster + prog "ISO Master" _none_ isomaster prog "Quod Libet" /usr/share/icons/hicolor/64x64/apps/quodlibet.png quodlibet } - menu "Network" /usr/share/icons/mate-colors-common/16x16/categories/applications-internet.png { - prog "Claws Mail" /usr/share/icons/mate-colors-common/16x16/apps/claws-mail.png claws-mail + menu "Network" /usr/share/icons/mate/16x16/categories/applications-internet.png { + prog "Claws Mail" /usr/share/icons/hicolor/48x48/apps/claws-mail.png claws-mail prog "Firefox" /usr/share/icons/hicolor/16x16/apps/firefox.png firefox - prog "Pidgin Internet Messenger" /usr/share/icons/mate-colors-common/16x16/apps/pidgin.png pidgin + prog "Pidgin Internet Messenger" /usr/share/icons/hicolor/16x16/apps/pidgin.png pidgin prog "Transmission" /usr/share/icons/hicolor/16x16/apps/transmission.png transmission-gtk - prog "gFTP" /usr/share/icons/mate-colors-common/16x16/apps/gftp.png gftp + prog "gFTP" /usr/share/icons/hicolor/16x16/apps/gftp.png gftp prog "ownCloud desktop sync client" /usr/share/icons/hicolor/22x22/apps/owncloud.png /usr/bin/owncloud } - menu "Office" /usr/share/icons/mate-colors-common/16x16/categories/applications-office.png { + menu "Office" /usr/share/icons/mate/16x16/categories/applications-office.png { prog "Atril Document Viewer" /usr/share/icons/hicolor/16x16/apps/atril.png atril prog "Dictionary" /usr/share/icons/mate/16x16/apps/accessories-dictionary.png mate-dictionary - prog "HTMLDOC" /usr/share/icons/hicolor/16x16/apps/htmldoc.png htmldoc - prog "LibreOffice 4.4 Base" /usr/share/icons/hicolor/16x16/apps/libreoffice4.4-base.png libreoffice4.4 --base - prog "LibreOffice 4.4 Calc" /usr/share/icons/hicolor/16x16/apps/libreoffice4.4-calc.png libreoffice4.4 --calc - prog "LibreOffice 4.4 Impress" /usr/share/icons/hicolor/16x16/apps/libreoffice4.4-impress.png libreoffice4.4 --impress - prog "LibreOffice 4.4 Writer" /usr/share/icons/hicolor/16x16/apps/libreoffice4.4-writer.png libreoffice4.4 --writer - prog "calibre" /usr/share/icons/hicolor/16x16/apps/calibre-gui.png calibre + prog "HTMLDOC" _none_ htmldoc + prog "LibreOffice 4.4 Base" _none_ libreoffice4.4 --base + prog "LibreOffice 4.4 Calc" _none_ libreoffice4.4 --calc + prog "LibreOffice 4.4 Draw" _none_ libreoffice4.4 --draw + prog "LibreOffice 4.4 Impress" _none_ libreoffice4.4 --impress + prog "LibreOffice 4.4 Math" _none_ libreoffice4.4 --math + prog "LibreOffice 4.4 Writer" _none_ libreoffice4.4 --writer + prog "calibre" _none_ calibre } - menu "Settings" /usr/share/icons/mate-colors-common/16x16/categories/preferences-desktop.png { + menu "Settings" /usr/share/icons/mate/16x16/categories/preferences-desktop.png { prog "Bluetooth Manager" /usr/share/icons/hicolor/16x16/apps/blueman.png blueman-manager prog "Power Management" /usr/share/icons/hicolor/16x16/apps/mate-power-manager.png mate-power-preferences - prog "Qt4 Config" _none_ qtconfig - prog "Screensaver" /usr/share/icons/mate-colors-common/16x16/apps/xscreensaver.png xscreensaver-demo + prog "Qt4 Config" /usr/share/icons/hicolor/48x48/apps/qt-logo.png qtconfig + prog "Screensaver" /usr/share/icons/mate/16x16/apps/xscreensaver.png xscreensaver-demo } - menu "System" /usr/share/icons/mate-colors-common/16x16/categories/applications-system.png { - prog "ALSA sound card" /usr/share/icons/hicolor/16x16/apps/gtkalsasetup.png gksu gtkalsasetup + menu "System" /usr/share/icons/mate/16x16/categories/applications-system.png { + prog "ALSA sound card" _none_ gksu gtkalsasetup prog "Disk Usage Analyzer" /usr/share/icons/hicolor/24x24/apps/mate-disk-usage-analyzer.png mate-disk-usage-analyzer prog "Dotnew" /usr/share/icons/hicolor/16x16/apps/dotnew.png gksu dotnew-gtk prog "Grsync" /usr/share/icons/hicolor/48x48/apps/grsync.png /usr/bin/grsync -i prog "Gslapt Package Manager" /usr/share/icons/hicolor/48x48/apps/gslapt.png gksu /usr/sbin/gslapt prog "Hostnames" /usr/share/icons/hicolor/16x16/apps/gtkhostsetup.png gksu gtkhostsetup - prog "Htop" /usr/share/icons/mate-colors-common/16x16/apps/htop.png xterm -e htop + prog "Htop" /usr/share/pixmaps/htop.png xterm -e htop prog "Keyboard" /usr/share/icons/hicolor/16x16/apps/gtkkeyboardsetup.png gksu gtkkeyboardsetup prog "Log File Viewer" /usr/share/icons/mate/16x16/apps/logviewer.png mate-system-log - prog "MATE Terminal" /usr/share/icons/mate-colors-common/16x16/apps/utilities-terminal.png mate-terminal - prog "Manage Printing" /usr/share/icons/mate-colors-common/16x16/devices/cups.png /usr/bin/xdg-open http://localhost:631/ + prog "MATE Terminal" /usr/share/icons/mate/16x16/apps/utilities-terminal.png mate-terminal + prog "Manage Printing" /usr/share/icons/hicolor/16x16/apps/cups.png /usr/bin/xdg-open http://localhost:631/ prog "Power Statistics" /usr/share/icons/hicolor/16x16/apps/mate-power-statistics.png mate-power-statistics prog "Sourcery SlackBuild Manager" /usr/share/icons/hicolor/16x16/apps/sourcery.png gksu sourcery prog "System clock" /usr/share/icons/hicolor/16x16/apps/gtkclocksetup.png gksu gtkclocksetup diff --git a/tests/menus_correct/jwm b/tests/menus_correct/jwm index dadaf70..f525bf9 100644 --- a/tests/menus_correct/jwm +++ b/tests/menus_correct/jwm @@ -24,7 +24,6 @@ /usr/lib64/rstudio/bin/rstudio - libreoffice4.4 --math xterm -e R @@ -36,7 +35,6 @@ gimp-2.8 gcolor2 lrfviewer - libreoffice4.4 --draw simple-scan viewnior @@ -64,7 +62,9 @@ htmldoc libreoffice4.4 --base libreoffice4.4 --calc + libreoffice4.4 --draw libreoffice4.4 --impress + libreoffice4.4 --math libreoffice4.4 --writer calibre diff --git a/tests/menus_correct/jwm_fr b/tests/menus_correct/jwm_fr index 197a639..ab3ae58 100644 --- a/tests/menus_correct/jwm_fr +++ b/tests/menus_correct/jwm_fr @@ -17,7 +17,9 @@ htmldoc libreoffice4.4 --base libreoffice4.4 --calc + libreoffice4.4 --draw libreoffice4.4 --impress + libreoffice4.4 --math libreoffice4.4 --writer atril calibre @@ -37,7 +39,6 @@ ebook-viewer gcolor2 lrfviewer - libreoffice4.4 --draw simple-scan viewnior gimp-2.8 @@ -91,7 +92,6 @@ dconf-editor - libreoffice4.4 --math xterm -e R diff --git a/tests/menus_correct/jwm_icons b/tests/menus_correct/jwm_icons index ada8b5e..8fe824a 100644 --- a/tests/menus_correct/jwm_icons +++ b/tests/menus_correct/jwm_icons @@ -1,91 +1,91 @@ - - + + engrampa gtkman salix - galculator + galculator keepassx leafpad - mate-search-tool - mate-screenshot --interactive - xournal - zim + mate-search-tool + mate-screenshot --interactive + xournal + zim - - cmake-gui - geany + + cmake-gui + geany glade-3 - meld + meld poedit assistant designer linguist - /usr/lib64/rstudio/bin/rstudio + /usr/lib64/rstudio/bin/rstudio - - libreoffice4.4 --math + xterm -e R - - xterm -e aoss xkegs + + xterm -e aoss xkegs - - dia - ebook-viewer + + dia + ebook-viewer gimp-2.8 - gcolor2 - lrfviewer - libreoffice4.4 --draw - simple-scan + gcolor2 + lrfviewer + simple-scan viewnior - - asunder - audacity - exfalso - exaile - gnome-mplayer + + asunder + audacity + exfalso + exaile + gnome-mplayer gaupol - isomaster - quodlibet + isomaster + quodlibet - - claws-mail + + claws-mail firefox - pidgin + pidgin transmission-gtk - gftp + gftp /usr/bin/owncloud - + atril mate-dictionary - htmldoc - libreoffice4.4 --base - libreoffice4.4 --calc - libreoffice4.4 --impress - libreoffice4.4 --writer - calibre + htmldoc + libreoffice4.4 --base + libreoffice4.4 --calc + libreoffice4.4 --draw + libreoffice4.4 --impress + libreoffice4.4 --math + libreoffice4.4 --writer + calibre - + blueman-manager mate-power-preferences - qtconfig - xscreensaver-demo + qtconfig + xscreensaver-demo - - gksu gtkalsasetup - mate-disk-usage-analyzer + + gksu gtkalsasetup + mate-disk-usage-analyzer gksu dotnew-gtk /usr/bin/grsync -i gksu /usr/sbin/gslapt gksu gtkhostsetup - xterm -e htop + xterm -e htop gksu gtkkeyboardsetup mate-system-log - mate-terminal - /usr/bin/xdg-open http://localhost:631/ + mate-terminal + /usr/bin/xdg-open http://localhost:631/ mate-power-statistics gksu sourcery gksu gtkclocksetup diff --git a/tests/menus_correct/pekwm b/tests/menus_correct/pekwm index 08af2ed..e585caf 100644 --- a/tests/menus_correct/pekwm +++ b/tests/menus_correct/pekwm @@ -22,7 +22,6 @@ Submenu = "Applications" { Entry = "RStudio" { Actions = "Exec /usr/lib64/rstudio/bin/rstudio &" } } Submenu = "Education" { - Entry = "LibreOffice 4.4 Math" { Actions = "Exec libreoffice4.4 --math &" } Entry = "R" { Actions = "Exec xterm -e R &" } } Submenu = "Games" { @@ -34,7 +33,6 @@ Submenu = "Applications" { Entry = "GNU Image Manipulation Program" { Actions = "Exec gimp-2.8 &" } Entry = "Gcolor2" { Actions = "Exec gcolor2 &" } Entry = "LRF Viewer" { Actions = "Exec lrfviewer &" } - Entry = "LibreOffice 4.4 Draw" { Actions = "Exec libreoffice4.4 --draw &" } Entry = "Simple Scan" { Actions = "Exec simple-scan &" } Entry = "Viewnior" { Actions = "Exec viewnior &" } } @@ -62,7 +60,9 @@ Submenu = "Applications" { Entry = "HTMLDOC" { Actions = "Exec htmldoc &" } Entry = "LibreOffice 4.4 Base" { Actions = "Exec libreoffice4.4 --base &" } Entry = "LibreOffice 4.4 Calc" { Actions = "Exec libreoffice4.4 --calc &" } + Entry = "LibreOffice 4.4 Draw" { Actions = "Exec libreoffice4.4 --draw &" } Entry = "LibreOffice 4.4 Impress" { Actions = "Exec libreoffice4.4 --impress &" } + Entry = "LibreOffice 4.4 Math" { Actions = "Exec libreoffice4.4 --math &" } Entry = "LibreOffice 4.4 Writer" { Actions = "Exec libreoffice4.4 --writer &" } Entry = "calibre" { Actions = "Exec calibre &" } } diff --git a/tests/menus_correct/pekwm_dynamic b/tests/menus_correct/pekwm_dynamic index ea06ec5..974c4a5 100644 --- a/tests/menus_correct/pekwm_dynamic +++ b/tests/menus_correct/pekwm_dynamic @@ -23,7 +23,6 @@ Dynamic { Entry = "RStudio" { Actions = "Exec /usr/lib64/rstudio/bin/rstudio &" } } Submenu = "Education" { - Entry = "LibreOffice 4.4 Math" { Actions = "Exec libreoffice4.4 --math &" } Entry = "R" { Actions = "Exec xterm -e R &" } } Submenu = "Games" { @@ -35,7 +34,6 @@ Dynamic { Entry = "GNU Image Manipulation Program" { Actions = "Exec gimp-2.8 &" } Entry = "Gcolor2" { Actions = "Exec gcolor2 &" } Entry = "LRF Viewer" { Actions = "Exec lrfviewer &" } - Entry = "LibreOffice 4.4 Draw" { Actions = "Exec libreoffice4.4 --draw &" } Entry = "Simple Scan" { Actions = "Exec simple-scan &" } Entry = "Viewnior" { Actions = "Exec viewnior &" } } @@ -63,7 +61,9 @@ Dynamic { Entry = "HTMLDOC" { Actions = "Exec htmldoc &" } Entry = "LibreOffice 4.4 Base" { Actions = "Exec libreoffice4.4 --base &" } Entry = "LibreOffice 4.4 Calc" { Actions = "Exec libreoffice4.4 --calc &" } + Entry = "LibreOffice 4.4 Draw" { Actions = "Exec libreoffice4.4 --draw &" } Entry = "LibreOffice 4.4 Impress" { Actions = "Exec libreoffice4.4 --impress &" } + Entry = "LibreOffice 4.4 Math" { Actions = "Exec libreoffice4.4 --math &" } Entry = "LibreOffice 4.4 Writer" { Actions = "Exec libreoffice4.4 --writer &" } Entry = "calibre" { Actions = "Exec calibre &" } } diff --git a/tests/menus_correct/pekwm_icons b/tests/menus_correct/pekwm_icons index c5bb05c..3f9f567 100644 --- a/tests/menus_correct/pekwm_icons +++ b/tests/menus_correct/pekwm_icons @@ -1,89 +1,89 @@ Submenu = "Applications" { Icon = "/usr/share/icons/mate/16x16/categories/applications-other.png" - Submenu = "Accessories" { Icon = "/usr/share/icons/mate-colors-common/16x16/categories/applications-accessories.png" + Submenu = "Accessories" { Icon = "/usr/share/icons/mate/16x16/categories/applications-accessories.png" Entry = "Engrampa Archive Manager" { Icon = "/usr/share/icons/hicolor/16x16/apps/engrampa.png"; Actions = "Exec engrampa &" } Entry = "GTKMan Manual Page Viewer" { Icon = "/usr/share/icons/hicolor/16x16/apps/gtkman.png"; Actions = "Exec gtkman salix &" } Entry = "Galculator" { Icon = "/usr/share/icons/hicolor/48x48/apps/galculator.png"; Actions = "Exec galculator &" } Entry = "KeePassX" { Icon = "/usr/share/pixmaps/keepassx.xpm"; Actions = "Exec keepassx &" } Entry = "Leafpad" { Icon = "/usr/share/icons/hicolor/16x16/apps/leafpad.png"; Actions = "Exec leafpad &" } - Entry = "Search for Files..." { Icon = "/usr/share/icons/mate-colors-common/16x16/actions/system-search.png"; Actions = "Exec mate-search-tool &" } - Entry = "Take Screenshot" { Icon = "/usr/share/icons/mate-colors-common/16x16/devices/applets-screenshooter.png"; Actions = "Exec mate-screenshot --interactive &" } + Entry = "Search for Files..." { Icon = "/usr/share/icons/mate/16x16/actions/system-search.png"; Actions = "Exec mate-search-tool &" } + Entry = "Take Screenshot" { Icon = "/usr/share/icons/mate/16x16/apps/applets-screenshooter.png"; Actions = "Exec mate-screenshot --interactive &" } Entry = "Xournal" { Actions = "Exec xournal &" } - Entry = "Zim Desktop Wiki" { Icon = "/usr/share/icons/mate-colors-common/16x16/apps/zim.png"; Actions = "Exec zim &" } + Entry = "Zim Desktop Wiki" { Icon = "/usr/share/icons/hicolor/64x64/apps/zim.png"; Actions = "Exec zim &" } } - Submenu = "Development" { Icon = "/usr/share/icons/mate-colors-common/16x16/categories/applications-development.png" - Entry = "CMake" { Icon = "/usr/share/pixmaps/CMakeSetup32.png"; Actions = "Exec cmake-gui &" } - Entry = "Geany" { Icon = "/usr/share/icons/mate-colors-common/16x16/apps/geany.png"; Actions = "Exec geany &" } + Submenu = "Development" { Icon = "/usr/share/icons/mate/16x16/categories/applications-development.png" + Entry = "CMake" { Actions = "Exec cmake-gui &" } + Entry = "Geany" { Icon = "/usr/share/icons/hicolor/16x16/apps/geany.png"; Actions = "Exec geany &" } Entry = "Glade" { Icon = "/usr/share/icons/hicolor/16x16/apps/glade-3.png"; Actions = "Exec glade-3 &" } - Entry = "Meld" { Icon = "/usr/share/icons/mate-colors-common/16x16/apps/meld.png"; Actions = "Exec meld &" } + Entry = "Meld" { Icon = "/usr/share/icons/hicolor/16x16/apps/meld.png"; Actions = "Exec meld &" } Entry = "Poedit" { Icon = "/usr/share/icons/hicolor/16x16/apps/poedit.png"; Actions = "Exec poedit &" } Entry = "Qt4 Assistant" { Icon = "/usr/share/icons/hicolor/32x32/apps/assistant.png"; Actions = "Exec assistant &" } Entry = "Qt4 Designer" { Icon = "/usr/share/icons/hicolor/128x128/apps/designer.png"; Actions = "Exec designer &" } Entry = "Qt4 Linguist" { Icon = "/usr/share/icons/hicolor/16x16/apps/linguist.png"; Actions = "Exec linguist &" } - Entry = "RStudio" { Icon = "/usr/share/icons/hicolor/16x16/apps/rstudio.png"; Actions = "Exec /usr/lib64/rstudio/bin/rstudio &" } + Entry = "RStudio" { Icon = "/usr/share/icons/hicolor/48x48/apps/rstudio.png"; Actions = "Exec /usr/lib64/rstudio/bin/rstudio &" } } Submenu = "Education" { - Entry = "LibreOffice 4.4 Math" { Icon = "/usr/share/icons/hicolor/16x16/apps/libreoffice4.4-math.png"; Actions = "Exec libreoffice4.4 --math &" } Entry = "R" { Icon = "/usr/share/icons/hicolor/16x16/apps/R.png"; Actions = "Exec xterm -e R &" } } - Submenu = "Games" { Icon = "/usr/share/icons/mate-colors-common/16x16/categories/applications-games.png" - Entry = "KEGS" { Icon = "/usr/share/pixmaps/kegs.png"; Actions = "Exec xterm -e aoss xkegs &" } + Submenu = "Games" { Icon = "/usr/share/icons/mate/16x16/categories/applications-games.png" + Entry = "KEGS" { Actions = "Exec xterm -e aoss xkegs &" } } Submenu = "Graphics" { Icon = "/usr/share/icons/mate/16x16/categories/applications-graphics.png" - Entry = "Dia Diagram Editor" { Icon = "/usr/share/icons/mate-colors-common/16x16/apps/dia.png"; Actions = "Exec dia &" } - Entry = "E-book Viewer" { Icon = "/usr/share/icons/hicolor/16x16/apps/calibre-viewer.png"; Actions = "Exec ebook-viewer &" } + Entry = "Dia Diagram Editor" { Icon = "/usr/share/icons/hicolor/16x16/apps/dia.png"; Actions = "Exec dia &" } + Entry = "E-book Viewer" { Actions = "Exec ebook-viewer &" } Entry = "GNU Image Manipulation Program" { Icon = "/usr/share/icons/hicolor/16x16/apps/gimp.png"; Actions = "Exec gimp-2.8 &" } - Entry = "Gcolor2" { Icon = "/usr/share/icons/hicolor/16x16/apps/gcolor2.png"; Actions = "Exec gcolor2 &" } - Entry = "LRF Viewer" { Icon = "/usr/share/icons/hicolor/16x16/apps/calibre-viewer.png"; Actions = "Exec lrfviewer &" } - Entry = "LibreOffice 4.4 Draw" { Icon = "/usr/share/icons/hicolor/16x16/apps/libreoffice4.4-draw.png"; Actions = "Exec libreoffice4.4 --draw &" } + Entry = "Gcolor2" { Icon = "/usr/share/icons/mate/16x16/apps/gcolor2.png"; Actions = "Exec gcolor2 &" } + Entry = "LRF Viewer" { Actions = "Exec lrfviewer &" } Entry = "Simple Scan" { Icon = "/usr/share/icons/mate/16x16/devices/scanner.png"; Actions = "Exec simple-scan &" } Entry = "Viewnior" { Icon = "/usr/share/icons/hicolor/16x16/apps/viewnior.png"; Actions = "Exec viewnior &" } } - Submenu = "Multimedia" { Icon = "/usr/share/icons/mate-colors-common/16x16/categories/applications-multimedia.png" - Entry = "Asunder CD Ripper" { Icon = "/usr/share/icons/hicolor/48x48/apps/asunder.png"; Actions = "Exec asunder &" } - Entry = "Audacity" { Icon = "/usr/share/icons/mate-colors-common/16x16/apps/audacity.png"; Actions = "Exec audacity &" } + Submenu = "Multimedia" { Icon = "/usr/share/icons/mate/16x16/categories/applications-multimedia.png" + Entry = "Asunder CD Ripper" { Actions = "Exec asunder &" } + Entry = "Audacity" { Icon = "/usr/share/icons/hicolor/16x16/apps/audacity.png"; Actions = "Exec audacity &" } Entry = "Ex Falso" { Icon = "/usr/share/icons/hicolor/64x64/apps/exfalso.png"; Actions = "Exec exfalso &" } - Entry = "Exaile" { Icon = "/usr/share/icons/mate-colors-common/16x16/apps/exaile.png"; Actions = "Exec exaile &" } - Entry = "GNOME MPlayer" { Icon = "/usr/share/icons/mate-colors-common/16x16/apps/gnome-mplayer.png"; Actions = "Exec gnome-mplayer &" } + Entry = "Exaile" { Icon = "/usr/share/icons/hicolor/48x48/apps/exaile.png"; Actions = "Exec exaile &" } + Entry = "GNOME MPlayer" { Actions = "Exec gnome-mplayer &" } Entry = "Gaupol" { Icon = "/usr/share/icons/hicolor/16x16/apps/gaupol.png"; Actions = "Exec gaupol &" } - Entry = "ISO Master" { Icon = "/usr/share/icons/hicolor/16x16/apps/isomaster.png"; Actions = "Exec isomaster &" } + Entry = "ISO Master" { Actions = "Exec isomaster &" } Entry = "Quod Libet" { Icon = "/usr/share/icons/hicolor/64x64/apps/quodlibet.png"; Actions = "Exec quodlibet &" } } - Submenu = "Network" { Icon = "/usr/share/icons/mate-colors-common/16x16/categories/applications-internet.png" - Entry = "Claws Mail" { Icon = "/usr/share/icons/mate-colors-common/16x16/apps/claws-mail.png"; Actions = "Exec claws-mail &" } + Submenu = "Network" { Icon = "/usr/share/icons/mate/16x16/categories/applications-internet.png" + Entry = "Claws Mail" { Icon = "/usr/share/icons/hicolor/48x48/apps/claws-mail.png"; Actions = "Exec claws-mail &" } Entry = "Firefox" { Icon = "/usr/share/icons/hicolor/16x16/apps/firefox.png"; Actions = "Exec firefox &" } - Entry = "Pidgin Internet Messenger" { Icon = "/usr/share/icons/mate-colors-common/16x16/apps/pidgin.png"; Actions = "Exec pidgin &" } + Entry = "Pidgin Internet Messenger" { Icon = "/usr/share/icons/hicolor/16x16/apps/pidgin.png"; Actions = "Exec pidgin &" } Entry = "Transmission" { Icon = "/usr/share/icons/hicolor/16x16/apps/transmission.png"; Actions = "Exec transmission-gtk &" } - Entry = "gFTP" { Icon = "/usr/share/icons/mate-colors-common/16x16/apps/gftp.png"; Actions = "Exec gftp &" } + Entry = "gFTP" { Icon = "/usr/share/icons/hicolor/16x16/apps/gftp.png"; Actions = "Exec gftp &" } Entry = "ownCloud desktop sync client" { Icon = "/usr/share/icons/hicolor/22x22/apps/owncloud.png"; Actions = "Exec /usr/bin/owncloud &" } } - Submenu = "Office" { Icon = "/usr/share/icons/mate-colors-common/16x16/categories/applications-office.png" + Submenu = "Office" { Icon = "/usr/share/icons/mate/16x16/categories/applications-office.png" Entry = "Atril Document Viewer" { Icon = "/usr/share/icons/hicolor/16x16/apps/atril.png"; Actions = "Exec atril &" } Entry = "Dictionary" { Icon = "/usr/share/icons/mate/16x16/apps/accessories-dictionary.png"; Actions = "Exec mate-dictionary &" } - Entry = "HTMLDOC" { Icon = "/usr/share/icons/hicolor/16x16/apps/htmldoc.png"; Actions = "Exec htmldoc &" } - Entry = "LibreOffice 4.4 Base" { Icon = "/usr/share/icons/hicolor/16x16/apps/libreoffice4.4-base.png"; Actions = "Exec libreoffice4.4 --base &" } - Entry = "LibreOffice 4.4 Calc" { Icon = "/usr/share/icons/hicolor/16x16/apps/libreoffice4.4-calc.png"; Actions = "Exec libreoffice4.4 --calc &" } - Entry = "LibreOffice 4.4 Impress" { Icon = "/usr/share/icons/hicolor/16x16/apps/libreoffice4.4-impress.png"; Actions = "Exec libreoffice4.4 --impress &" } - Entry = "LibreOffice 4.4 Writer" { Icon = "/usr/share/icons/hicolor/16x16/apps/libreoffice4.4-writer.png"; Actions = "Exec libreoffice4.4 --writer &" } - Entry = "calibre" { Icon = "/usr/share/icons/hicolor/16x16/apps/calibre-gui.png"; Actions = "Exec calibre &" } + Entry = "HTMLDOC" { Actions = "Exec htmldoc &" } + Entry = "LibreOffice 4.4 Base" { Actions = "Exec libreoffice4.4 --base &" } + Entry = "LibreOffice 4.4 Calc" { Actions = "Exec libreoffice4.4 --calc &" } + Entry = "LibreOffice 4.4 Draw" { Actions = "Exec libreoffice4.4 --draw &" } + Entry = "LibreOffice 4.4 Impress" { Actions = "Exec libreoffice4.4 --impress &" } + Entry = "LibreOffice 4.4 Math" { Actions = "Exec libreoffice4.4 --math &" } + Entry = "LibreOffice 4.4 Writer" { Actions = "Exec libreoffice4.4 --writer &" } + Entry = "calibre" { Actions = "Exec calibre &" } } - Submenu = "Settings" { Icon = "/usr/share/icons/mate-colors-common/16x16/categories/preferences-desktop.png" + Submenu = "Settings" { Icon = "/usr/share/icons/mate/16x16/categories/preferences-desktop.png" Entry = "Bluetooth Manager" { Icon = "/usr/share/icons/hicolor/16x16/apps/blueman.png"; Actions = "Exec blueman-manager &" } Entry = "Power Management" { Icon = "/usr/share/icons/hicolor/16x16/apps/mate-power-manager.png"; Actions = "Exec mate-power-preferences &" } - Entry = "Qt4 Config" { Actions = "Exec qtconfig &" } - Entry = "Screensaver" { Icon = "/usr/share/icons/mate-colors-common/16x16/apps/xscreensaver.png"; Actions = "Exec xscreensaver-demo &" } + Entry = "Qt4 Config" { Icon = "/usr/share/icons/hicolor/48x48/apps/qt-logo.png"; Actions = "Exec qtconfig &" } + Entry = "Screensaver" { Icon = "/usr/share/icons/mate/16x16/apps/xscreensaver.png"; Actions = "Exec xscreensaver-demo &" } } - Submenu = "System" { Icon = "/usr/share/icons/mate-colors-common/16x16/categories/applications-system.png" - Entry = "ALSA sound card" { Icon = "/usr/share/icons/hicolor/16x16/apps/gtkalsasetup.png"; Actions = "Exec gksu gtkalsasetup &" } + Submenu = "System" { Icon = "/usr/share/icons/mate/16x16/categories/applications-system.png" + Entry = "ALSA sound card" { Actions = "Exec gksu gtkalsasetup &" } Entry = "Disk Usage Analyzer" { Icon = "/usr/share/icons/hicolor/24x24/apps/mate-disk-usage-analyzer.png"; Actions = "Exec mate-disk-usage-analyzer &" } Entry = "Dotnew" { Icon = "/usr/share/icons/hicolor/16x16/apps/dotnew.png"; Actions = "Exec gksu dotnew-gtk &" } Entry = "Grsync" { Icon = "/usr/share/icons/hicolor/48x48/apps/grsync.png"; Actions = "Exec /usr/bin/grsync -i &" } Entry = "Gslapt Package Manager" { Icon = "/usr/share/icons/hicolor/48x48/apps/gslapt.png"; Actions = "Exec gksu /usr/sbin/gslapt &" } Entry = "Hostnames" { Icon = "/usr/share/icons/hicolor/16x16/apps/gtkhostsetup.png"; Actions = "Exec gksu gtkhostsetup &" } - Entry = "Htop" { Icon = "/usr/share/icons/mate-colors-common/16x16/apps/htop.png"; Actions = "Exec xterm -e htop &" } + Entry = "Htop" { Icon = "/usr/share/pixmaps/htop.png"; Actions = "Exec xterm -e htop &" } Entry = "Keyboard" { Icon = "/usr/share/icons/hicolor/16x16/apps/gtkkeyboardsetup.png"; Actions = "Exec gksu gtkkeyboardsetup &" } Entry = "Log File Viewer" { Icon = "/usr/share/icons/mate/16x16/apps/logviewer.png"; Actions = "Exec mate-system-log &" } - Entry = "MATE Terminal" { Icon = "/usr/share/icons/mate-colors-common/16x16/apps/utilities-terminal.png"; Actions = "Exec mate-terminal &" } - Entry = "Manage Printing" { Icon = "/usr/share/icons/mate-colors-common/16x16/devices/cups.png"; Actions = "Exec /usr/bin/xdg-open http://localhost:631/ &" } + Entry = "MATE Terminal" { Icon = "/usr/share/icons/mate/16x16/apps/utilities-terminal.png"; Actions = "Exec mate-terminal &" } + Entry = "Manage Printing" { Icon = "/usr/share/icons/hicolor/16x16/apps/cups.png"; Actions = "Exec /usr/bin/xdg-open http://localhost:631/ &" } Entry = "Power Statistics" { Icon = "/usr/share/icons/hicolor/16x16/apps/mate-power-statistics.png"; Actions = "Exec mate-power-statistics &" } Entry = "Sourcery SlackBuild Manager" { Icon = "/usr/share/icons/hicolor/16x16/apps/sourcery.png"; Actions = "Exec gksu sourcery &" } Entry = "System clock" { Icon = "/usr/share/icons/hicolor/16x16/apps/gtkclocksetup.png"; Actions = "Exec gksu gtkclocksetup &" } diff --git a/tests/menus_correct/twm b/tests/menus_correct/twm index 79b3309..9d16b92 100644 --- a/tests/menus_correct/twm +++ b/tests/menus_correct/twm @@ -37,7 +37,6 @@ menu "Development" } menu "Education" { - "LibreOffice 4.4 Math" f.exec "libreoffice4.4 --math &" "R" f.exec "xterm -e R &" } menu "Games" @@ -51,7 +50,6 @@ menu "Graphics" "GNU Image Manipulation Program" f.exec "gimp-2.8 &" "Gcolor2" f.exec "gcolor2 &" "LRF Viewer" f.exec "lrfviewer &" - "LibreOffice 4.4 Draw" f.exec "libreoffice4.4 --draw &" "Simple Scan" f.exec "simple-scan &" "Viewnior" f.exec "viewnior &" } @@ -82,7 +80,9 @@ menu "Office" "HTMLDOC" f.exec "htmldoc &" "LibreOffice 4.4 Base" f.exec "libreoffice4.4 --base &" "LibreOffice 4.4 Calc" f.exec "libreoffice4.4 --calc &" + "LibreOffice 4.4 Draw" f.exec "libreoffice4.4 --draw &" "LibreOffice 4.4 Impress" f.exec "libreoffice4.4 --impress &" + "LibreOffice 4.4 Math" f.exec "libreoffice4.4 --math &" "LibreOffice 4.4 Writer" f.exec "libreoffice4.4 --writer &" "calibre" f.exec "calibre &" } diff --git a/tests/menus_correct/twm_titles b/tests/menus_correct/twm_titles index 80c3c17..95542f0 100644 --- a/tests/menus_correct/twm_titles +++ b/tests/menus_correct/twm_titles @@ -41,7 +41,6 @@ menu "Development" menu "Education" { "Education" f.title - "LibreOffice 4.4 Math" f.exec "libreoffice4.4 --math &" "R" f.exec "xterm -e R &" } menu "Games" @@ -57,7 +56,6 @@ menu "Graphics" "GNU Image Manipulation Program" f.exec "gimp-2.8 &" "Gcolor2" f.exec "gcolor2 &" "LRF Viewer" f.exec "lrfviewer &" - "LibreOffice 4.4 Draw" f.exec "libreoffice4.4 --draw &" "Simple Scan" f.exec "simple-scan &" "Viewnior" f.exec "viewnior &" } @@ -91,7 +89,9 @@ menu "Office" "HTMLDOC" f.exec "htmldoc &" "LibreOffice 4.4 Base" f.exec "libreoffice4.4 --base &" "LibreOffice 4.4 Calc" f.exec "libreoffice4.4 --calc &" + "LibreOffice 4.4 Draw" f.exec "libreoffice4.4 --draw &" "LibreOffice 4.4 Impress" f.exec "libreoffice4.4 --impress &" + "LibreOffice 4.4 Math" f.exec "libreoffice4.4 --math &" "LibreOffice 4.4 Writer" f.exec "libreoffice4.4 --writer &" "calibre" f.exec "calibre &" } diff --git a/tests/menus_correct/twm_titles_el b/tests/menus_correct/twm_titles_el index 4380dbe..c3f706f 100644 --- a/tests/menus_correct/twm_titles_el +++ b/tests/menus_correct/twm_titles_el @@ -44,7 +44,9 @@ menu "Γραφείο" "HTMLDOC" f.exec "htmldoc &" "LibreOffice 4.4 Base" f.exec "libreoffice4.4 --base &" "LibreOffice 4.4 Calc" f.exec "libreoffice4.4 --calc &" + "LibreOffice 4.4 Draw" f.exec "libreoffice4.4 --draw &" "LibreOffice 4.4 Impress" f.exec "libreoffice4.4 --impress &" + "LibreOffice 4.4 Math" f.exec "libreoffice4.4 --math &" "LibreOffice 4.4 Writer" f.exec "libreoffice4.4 --writer &" "calibre" f.exec "calibre &" "Εφαρμογή προβολής εγγράφων Atril" f.exec "atril &" @@ -56,7 +58,6 @@ menu "Γραφικά" "E-book Viewer" f.exec "ebook-viewer &" "Gcolor2" f.exec "gcolor2 &" "LRF Viewer" f.exec "lrfviewer &" - "LibreOffice 4.4 Draw" f.exec "libreoffice4.4 --draw &" "Viewnior" f.exec "viewnior &" "Επεξεργαστής διαγραμμάτων Dia" f.exec "dia &" "Πρόγραμμα επεξεργασίας εικόνων GNU" f.exec "gimp-2.8 &" @@ -75,7 +76,6 @@ menu "Δίκτυο" menu "Εκπαίδευση" { "Εκπαίδευση" f.title - "LibreOffice 4.4 Math" f.exec "libreoffice4.4 --math &" "R" f.exec "xterm -e R &" } menu "Παιχνίδια" diff --git a/tests/menus_correct/windowmaker b/tests/menus_correct/windowmaker index cc10cc1..b2875cc 100644 --- a/tests/menus_correct/windowmaker +++ b/tests/menus_correct/windowmaker @@ -22,7 +22,6 @@ "RStudio" EXEC /usr/lib64/rstudio/bin/rstudio "Development" END "Education" MENU - "LibreOffice 4.4 Math" EXEC libreoffice4.4 --math "R" EXEC xterm -e R "Education" END "Games" MENU @@ -34,7 +33,6 @@ "GNU Image Manipulation Program" EXEC gimp-2.8 "Gcolor2" EXEC gcolor2 "LRF Viewer" EXEC lrfviewer - "LibreOffice 4.4 Draw" EXEC libreoffice4.4 --draw "Simple Scan" EXEC simple-scan "Viewnior" EXEC viewnior "Graphics" END @@ -62,7 +60,9 @@ "HTMLDOC" EXEC htmldoc "LibreOffice 4.4 Base" EXEC libreoffice4.4 --base "LibreOffice 4.4 Calc" EXEC libreoffice4.4 --calc + "LibreOffice 4.4 Draw" EXEC libreoffice4.4 --draw "LibreOffice 4.4 Impress" EXEC libreoffice4.4 --impress + "LibreOffice 4.4 Math" EXEC libreoffice4.4 --math "LibreOffice 4.4 Writer" EXEC libreoffice4.4 --writer "calibre" EXEC calibre "Office" END