forked from pool/kde-gtk-config5
95 lines
4.1 KiB
Diff
95 lines
4.1 KiB
Diff
diff --git a/gtk3proxies/CMakeLists.txt b/gtk3proxies/CMakeLists.txt
|
|
index 62becb4..2e8d236 100644
|
|
--- a/gtk3proxies/CMakeLists.txt
|
|
+++ b/gtk3proxies/CMakeLists.txt
|
|
@@ -2,7 +2,7 @@ find_package(GTK3 REQUIRED)
|
|
|
|
include_directories(${GTK3_INCLUDE_DIRS})
|
|
|
|
-add_executable(gtk3_preview preview3.c)
|
|
-target_compile_definitions(gtk3_preview PRIVATE "-DDATA_DIR=\"${DATA_INSTALL_DIR}/kcm-gtk-module/\"")
|
|
-target_link_libraries(gtk3_preview ${GTK3_LIBRARY} ${GOBJECT2_LIBRARY} ${GLIB2_LIBRARY})
|
|
-install(TARGETS gtk3_preview RUNTIME DESTINATION "${LIBEXEC_INSTALL_DIR}")
|
|
+add_executable(gtk3_preview5 preview3.c)
|
|
+target_compile_definitions(gtk3_preview5 PRIVATE "-DDATA_DIR=\"${DATA_INSTALL_DIR}/kcm-gtk-module/\"")
|
|
+target_link_libraries(gtk3_preview5 ${GTK3_LIBRARY} ${GOBJECT2_LIBRARY} ${GLIB2_LIBRARY})
|
|
+install(TARGETS gtk3_preview5 RUNTIME DESTINATION "${LIBEXEC_INSTALL_DIR}")
|
|
diff --git a/gtk3proxies/preview3.c b/gtk3proxies/preview3.c
|
|
index f5b10d0..a8b80fb 100644
|
|
--- a/gtk3proxies/preview3.c
|
|
+++ b/gtk3proxies/preview3.c
|
|
@@ -32,7 +32,7 @@ void printHelp()
|
|
"Small utility for previewing Gtk3 theme.\n"
|
|
"\n"
|
|
"Using:\n"
|
|
- "gtk3_preview <args>\n"
|
|
+ "gtk3_preview5 <args>\n"
|
|
"\n"
|
|
"Arguments:\n"
|
|
" -h, --help\tShows this help\n"
|
|
@@ -62,7 +62,7 @@ int main(int argc, char **argv)
|
|
return 0;
|
|
}
|
|
else if(strcmp("-V", argv[i])==0 || strcmp("--version", argv[i])==0) {
|
|
- printf("gtk2_preview version 1.0\n");
|
|
+ printf("gtk2_preview5 version 1.0\n");
|
|
return 0;
|
|
} else if(argc>1)
|
|
sscanf(argv[1], "%ld", &wid);
|
|
diff --git a/gtkproxies/CMakeLists.txt b/gtkproxies/CMakeLists.txt
|
|
index fe8e1a0..1ff5a78 100644
|
|
--- a/gtkproxies/CMakeLists.txt
|
|
+++ b/gtkproxies/CMakeLists.txt
|
|
@@ -7,10 +7,10 @@ target_link_libraries(reload_gtk_apps ${GTK2_LIBRARIES})
|
|
install(TARGETS reload_gtk_apps RUNTIME DESTINATION "${LIBEXEC_INSTALL_DIR}")
|
|
|
|
|
|
-add_executable(gtk_preview preview.c)
|
|
-target_compile_definitions(gtk_preview PRIVATE "-DDATA_DIR=\"${DATA_INSTALL_DIR}/kcm-gtk-module/\"")
|
|
-target_link_libraries(gtk_preview ${GTK2_LIBRARIES} ${GTK2_GIOMM_LIBRARY})
|
|
-install(TARGETS gtk_preview RUNTIME DESTINATION "${LIBEXEC_INSTALL_DIR}")
|
|
+add_executable(gtk_preview5 preview.c)
|
|
+target_compile_definitions(gtk_preview5 PRIVATE "-DDATA_DIR=\"${DATA_INSTALL_DIR}/kcm-gtk-module/\"")
|
|
+target_link_libraries(gtk_preview5 ${GTK2_LIBRARIES} ${GTK2_GIOMM_LIBRARY})
|
|
+install(TARGETS gtk_preview5 RUNTIME DESTINATION "${LIBEXEC_INSTALL_DIR}")
|
|
|
|
# preview file used for the gtk3 version too
|
|
install(FILES preview.ui
|
|
diff --git a/gtkproxies/preview.c b/gtkproxies/preview.c
|
|
index 5b40a44..55825b6 100644
|
|
--- a/gtkproxies/preview.c
|
|
+++ b/gtkproxies/preview.c
|
|
@@ -55,7 +55,7 @@ void printHelp()
|
|
"Small utility for previewing Gtk2 theme.\n"
|
|
"\n"
|
|
"Using:\n"
|
|
- "gtk_preview <args>\n"
|
|
+ "gtk_preview5 <args>\n"
|
|
"\n"
|
|
"Arguments:\n"
|
|
" -h, --help\tShows this help\n"
|
|
@@ -76,7 +76,7 @@ int main(int argc, char **argv)
|
|
return 0;
|
|
}
|
|
else if(strcmp("-V", argv[i])==0 || strcmp("--version", argv[i])==0) {
|
|
- printf("gtk_preview version 1.0\n");
|
|
+ printf("gtk_preview5 version 1.0\n");
|
|
return 0;
|
|
} else if(argc>1)
|
|
sscanf(argv[1], "%ld", &wid);
|
|
diff --git a/src/gtkconfigkcmodule.cpp b/src/gtkconfigkcmodule.cpp
|
|
index aea7f1c..a65a2a7 100644
|
|
--- a/src/gtkconfigkcmodule.cpp
|
|
+++ b/src/gtkconfigkcmodule.cpp
|
|
@@ -82,8 +82,8 @@ GTKConfigKCModule::GTKConfigKCModule(QWidget* parent, const QVariantList& args )
|
|
ui->gtk2Preview->setIcon(previewIcon);
|
|
ui->gtk3Preview->setIcon(previewIcon);
|
|
|
|
- QString gtk2Preview = QStandardPaths::findExecutable("gtk_preview");
|
|
- QString gtk3Preview = QStandardPaths::findExecutable("gtk3_preview");
|
|
+ QString gtk2Preview = QStandardPaths::findExecutable("gtk_preview5");
|
|
+ QString gtk3Preview = QStandardPaths::findExecutable("gtk3_preview5");
|
|
|
|
m_p2 = new KProcess(this);
|
|
m_p2->setEnv("GTK2_RC_FILES", m_tempGtk2Preview, true);
|