From 9ead135f515d75d71c8e655343f8cacbe864f400 Mon Sep 17 00:00:00 2001 From: dan Date: Sat, 23 Oct 2004 03:53:25 +0000 Subject: [PATCH] - Replaced Apps with Applications in WPrefs installation path - Added missing switchpanel.h to compile file list --- FAQ | 4 ++-- WPrefs.app/README | 2 +- WindowMaker/menu | 2 +- WindowMaker/menu.bg | 2 +- WindowMaker/menu.fi | 2 +- WindowMaker/menu.ko | 2 +- WindowMaker/menu.ro | 2 +- WindowMaker/menu.sk | 2 +- WindowMaker/menu.zh_TW | 2 +- WindowMaker/plmenu | 2 +- WindowMaker/plmenu.bg | 2 +- WindowMaker/plmenu.es | 2 +- WindowMaker/plmenu.fi | 2 +- WindowMaker/plmenu.ja | 2 +- WindowMaker/plmenu.ko | 2 +- WindowMaker/plmenu.ro | 2 +- WindowMaker/plmenu.sk | 2 +- WindowMaker/plmenu.zh_TW | 2 +- contrib/WindowMaker.spec.in | 2 +- src/Makefile.am | 1 + src/application.c | 2 +- 21 files changed, 22 insertions(+), 21 deletions(-) diff --git a/FAQ b/FAQ index fcb47992..1326b5b0 100644 --- a/FAQ +++ b/FAQ @@ -1102,12 +1102,12 @@ keep-on-top options for the dock and clip. 4.18 How do I restore the configuration app to the dock? ----------------------------------] You should start it from a terminal using its full path name, which is -/usr/local/GNUstep/Apps/WPrefs.app/WPrefs +/usr/local/GNUstep/Applications/WPrefs.app/WPrefs by default. 4.19 How do I define my own icon for a program? I don't like the one it - supplies. + supplies. ---------------------------------- Right-click the titlebar of the running application and start the Attributes Editor. Check the "Ignore client supplied icon" box. "Apply" and "Save", diff --git a/WPrefs.app/README b/WPrefs.app/README index fce17755..1a71b805 100644 --- a/WPrefs.app/README +++ b/WPrefs.app/README @@ -15,7 +15,7 @@ user guide to be fully aware of all available options and other features of WindowMaker that are not related to configuration. To run WPrefs, do not put it in your search path. Instead, run it -with the full path, like /usr/local/GNUstep/Apps/WPrefs.app/WPrefs +with the full path, like /usr/local/GNUstep/Applications/WPrefs.app/WPrefs Then, dock it's application icon. The dock will automatically detect it's icon and use it. diff --git a/WindowMaker/menu b/WindowMaker/menu index d548e957..cd876bdf 100644 --- a/WindowMaker/menu +++ b/WindowMaker/menu @@ -208,7 +208,7 @@ "Background" END "Save Theme" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)" "Save IconSet" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)" - "Preferences Utility" EXEC /usr/local/GNUstep/Apps/WPrefs.app/WPrefs + "Preferences Utility" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs "Appearance" END "Session" MENU diff --git a/WindowMaker/menu.bg b/WindowMaker/menu.bg index c47b3b6c..38935942 100644 --- a/WindowMaker/menu.bg +++ b/WindowMaker/menu.bg @@ -209,7 +209,7 @@ "Фон" END "Запази темата" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)" "Запази колекцията иконки" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)" - "Пособие за настройки" EXEC /usr/local/GNUstep/Apps/WPrefs.app/WPrefs + "Пособие за настройки" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs "Изглед" END "Изход" MENU diff --git a/WindowMaker/menu.fi b/WindowMaker/menu.fi index 7aa09a68..bd682b57 100644 --- a/WindowMaker/menu.fi +++ b/WindowMaker/menu.fi @@ -202,7 +202,7 @@ "Taustat" END "Tallenna teema" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Teeman nimi,Kirjoita teematiedoston nimi:)" "Tallenna kuvakkeet" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Kuvakesetin nimi,Kirjoita tiedostonnimi:)" - "Asetukset" EXEC /usr/local/GNUstep/Apps/WPrefs.app/WPrefs + "Asetukset" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs "Ulkonäkö" END "Lopeta" MENU diff --git a/WindowMaker/menu.ko b/WindowMaker/menu.ko index 40563076..8d4d0b89 100644 --- a/WindowMaker/menu.ko +++ b/WindowMaker/menu.ko @@ -163,7 +163,7 @@ "세션 지움" CLEAR_SESSION "창 관 리" END "작업환경" MENU - "설 정" SHEXEC /usr/local/GNUstep/Apps/WPrefs.app/WPrefs || wmakerconf + "설 정" SHEXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs || wmakerconf "테 마" OPEN_MENU -noext THEMES_DIR ~/GNUstep/Library/WindowMaker/Themes WITH setstyle "테마저장" EXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(테마 이름,파일 이름을 입력하세요:)" "아이콘셋" OPEN_MENU -noext ICON_SETS_DIR ~/GNUstep/Library/WindowMaker/IconSets WITH seticons diff --git a/WindowMaker/menu.ro b/WindowMaker/menu.ro index 62d15dd6..7026e233 100644 --- a/WindowMaker/menu.ro +++ b/WindowMaker/menu.ro @@ -202,7 +202,7 @@ "Fundal" END "Salvează Tema" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)" "Salvează Setul de Iconiţe" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)" - "Utilitar de Configurare" EXEC /usr/local/GNUstep/Apps/WPrefs.app/WPrefs + "Utilitar de Configurare" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs "Configurare" END "Ieşire" MENU diff --git a/WindowMaker/menu.sk b/WindowMaker/menu.sk index 622aa127..42b95201 100644 --- a/WindowMaker/menu.sk +++ b/WindowMaker/menu.sk @@ -216,7 +216,7 @@ "Pozadie" END "Uložiť tému" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Meno témy,Zadajte názov súboru:)" "Uložiť sadu ikon" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Meno sady ikon,Zadajte názov súboru:)" - "Konfiguračný nástroj" EXEC /usr/local/GNUstep/Apps/WPrefs.app/WPrefs + "Konfiguračný nástroj" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs "Vzhľad" END "Koniec" MENU diff --git a/WindowMaker/menu.zh_TW b/WindowMaker/menu.zh_TW index c65f54bb..cd78998b 100644 --- a/WindowMaker/menu.zh_TW +++ b/WindowMaker/menu.zh_TW @@ -199,7 +199,7 @@ "背景" END "儲存主題" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(主題名稱)" "儲存圖示集" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(圖示集名稱)" - "偏好設定公用程式" EXEC /usr/local/GNUstep/Apps/WPrefs.app/WPrefs + "偏好設定公用程式" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs "外觀" END "離開" MENU diff --git a/WindowMaker/plmenu b/WindowMaker/plmenu index a3793a95..f4e46411 100644 --- a/WindowMaker/plmenu +++ b/WindowMaker/plmenu @@ -93,7 +93,7 @@ ), ("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""), ("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""), - ("Preferences Utility", EXEC, "/usr/local/GNUstep/Apps/WPrefs.app/WPrefs") + ("Preferences Utility", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs") ), ("Session", ("Save Session", SAVE_SESSION), diff --git a/WindowMaker/plmenu.bg b/WindowMaker/plmenu.bg index 208884c3..ed0d704a 100644 --- a/WindowMaker/plmenu.bg +++ b/WindowMaker/plmenu.bg @@ -94,7 +94,7 @@ ), ("Запази темата", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""), ("Запази колекцията иконки", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""), - ("Пособие за настройки", EXEC, "/usr/local/GNUstep/Apps/WPrefs.app/WPrefs") + ("Пособие за настройки", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs") ), ("Изход", ("Рестартиране", RESTART), diff --git a/WindowMaker/plmenu.es b/WindowMaker/plmenu.es index 95e57f10..b1cadc3f 100644 --- a/WindowMaker/plmenu.es +++ b/WindowMaker/plmenu.es @@ -94,7 +94,7 @@ ), ("Guardar tema", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""), ("Guardar iconos", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""), - ("Preferencias", EXEC, "/usr/local/GNUstep/Apps/WPrefs.app/WPrefs") + ("Preferencias", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs") ), ("Salir", ("Reiniciar", RESTART), diff --git a/WindowMaker/plmenu.fi b/WindowMaker/plmenu.fi index 1cd2beb7..931f77d9 100644 --- a/WindowMaker/plmenu.fi +++ b/WindowMaker/plmenu.fi @@ -357,7 +357,7 @@ ( "Asetukset", EXEC, - "/usr/local/GNUstep/Apps/WPrefs.app/WPrefs" + "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs" ) ), ( diff --git a/WindowMaker/plmenu.ja b/WindowMaker/plmenu.ja index 5290f50a..0bf413f1 100644 --- a/WindowMaker/plmenu.ja +++ b/WindowMaker/plmenu.ja @@ -94,7 +94,7 @@ ), ("設定をテーマとしてセーブ", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""), ("現在のアイコンセットをセーブ", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""), - ("設定ユーティリティ", EXEC, "/usr/local/GNUstep/Apps/WPrefs.app/WPrefs") + ("設定ユーティリティ", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs") ), ("終了", ("再起動", RESTART), diff --git a/WindowMaker/plmenu.ko b/WindowMaker/plmenu.ko index e53ee2ec..5fad39ff 100644 --- a/WindowMaker/plmenu.ko +++ b/WindowMaker/plmenu.ko @@ -63,7 +63,7 @@ ), ("작업공간", WORKSPACE_MENU), ("작업환경", - ("설 정", SHEXEC, "/usr/local/GNUstep/Apps/WPrefs.app/WPrefs || wmakerconf"), + ("설 정", SHEXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs || wmakerconf"), ("테 마", OPEN_MENU, "-noext /usr/share/WindowMaker/Themes ~/GNUstep/Library/WindowMaker/Themes WITH setstyle"), ("테마저장", EXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(테마 이름,파일 이름을 입력하세요:)\""), ("스 타 일", OPEN_MENU, "-noext /usr/share/WindowMaker/Styles ~/GNUstep/Library/WindowMaker/Styles WITH setstyle"), diff --git a/WindowMaker/plmenu.ro b/WindowMaker/plmenu.ro index 731a314c..35d7a657 100644 --- a/WindowMaker/plmenu.ro +++ b/WindowMaker/plmenu.ro @@ -94,7 +94,7 @@ ), ("Salvează Tema", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""), ("Salvează Setul de Iconiţe", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""), - ("Utilitar de Configurare", EXEC, "/usr/local/GNUstep/Apps/WPrefs.app/WPrefs") + ("Utilitar de Configurare", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs") ), ("Ieşire", ("Repornire", RESTART), diff --git a/WindowMaker/plmenu.sk b/WindowMaker/plmenu.sk index 274abe4e..0174f716 100644 --- a/WindowMaker/plmenu.sk +++ b/WindowMaker/plmenu.sk @@ -94,7 +94,7 @@ ), ("Uložiť tému", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""), ("Uložiť sadu ikon", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""), - ("Konfiguračný nástroj", EXEC, "/usr/local/GNUstep/Apps/WPrefs.app/WPrefs") + ("Konfiguračný nástroj", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs") ), ("Koniec", ("Reštartovať", RESTART), diff --git a/WindowMaker/plmenu.zh_TW b/WindowMaker/plmenu.zh_TW index 2eccbdb9..5b2cf25b 100644 --- a/WindowMaker/plmenu.zh_TW +++ b/WindowMaker/plmenu.zh_TW @@ -92,7 +92,7 @@ ), ("儲存主題", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/%a(主題名稱)"), ("儲存圖示集", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/%a(圖示集名稱)"), - ("偏好設定公用程式", EXEC, "/usr/local/GNUstep/Apps/WPrefs.app/WPrefs") + ("偏好設定公用程式", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs") ), ("離開", ("重新啟動", RESTART), diff --git a/contrib/WindowMaker.spec.in b/contrib/WindowMaker.spec.in index 52104f7c..a999b274 100644 --- a/contrib/WindowMaker.spec.in +++ b/contrib/WindowMaker.spec.in @@ -60,7 +60,7 @@ cp -f WindowMaker/plmenu WindowMaker/Defaults/WMRootMenu make install DESTDIR=$RPM_BUILD_ROOT strip $RPM_BUILD_ROOT/usr/X11R6/bin/* || : -strip $RPM_BUILD_ROOT/usr/X11R6/lib/GNUstep/Apps/WPrefs.app/WPrefs +strip $RPM_BUILD_ROOT/usr/X11R6/lib/GNUstep/Applications/WPrefs.app/WPrefs %post -p /sbin/ldconfig %postun -p /sbin/ldconfig diff --git a/src/Makefile.am b/src/Makefile.am index 64c9780d..06d7700f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -64,6 +64,7 @@ wmaker_SOURCES = \ session.c \ shutdown.c \ switchpanel.c \ + switchpanel.h \ stacking.c \ stacking.h \ startup.c \ diff --git a/src/application.c b/src/application.c index 60cc68fe..24196ecd 100644 --- a/src/application.c +++ b/src/application.c @@ -197,7 +197,7 @@ wApplicationExtractDirPackIcon(WScreen *scr, char *path, { char *iconPath=NULL; /* Maybe the app is a .app and it has an icon in it, like - * /usr/local/GNUstep/Apps/WPrefs.app/WPrefs.tiff + * /usr/local/GNUstep/Applications/WPrefs.app/WPrefs.tiff */ if (strstr(path, ".app")) { char *tmp; -- 2.11.4.GIT