From fffe3bfaa80b54aa7c4cf8f23c13ff769a304dc7 Mon Sep 17 00:00:00 2001 From: daleclack Date: Sun, 28 Nov 2021 21:02:17 +0800 Subject: [PATCH] Update gtk117 --- Gtkmm3/gtk117_colorpicker/src/MyWin.cc | 2 +- README.md | 19 +++++++++++++------ {gtk-rs => gtk4-rs}/gtk-rs-dialogs/.gitignore | 0 .../gtk-rs-dialogs/.vscode/launch.json | 0 {gtk-rs => gtk4-rs}/gtk-rs-dialogs/Cargo.lock | 0 {gtk-rs => gtk4-rs}/gtk-rs-dialogs/Cargo.toml | 0 .../gtk-rs-dialogs/src/main.rs | 0 .../gtk-rs-media/.vscode/launch.json | 0 {gtk-rs => gtk4-rs}/gtk-rs-media/Cargo.lock | 0 {gtk-rs => gtk4-rs}/gtk-rs-media/Cargo.toml | 0 .../gtk-rs-media/gtk-rs-media.code-workspace | 8 ++++++++ {gtk-rs => gtk4-rs}/gtk-rs-media/src/main.rs | 0 12 files changed, 22 insertions(+), 7 deletions(-) rename {gtk-rs => gtk4-rs}/gtk-rs-dialogs/.gitignore (100%) rename {gtk-rs => gtk4-rs}/gtk-rs-dialogs/.vscode/launch.json (100%) rename {gtk-rs => gtk4-rs}/gtk-rs-dialogs/Cargo.lock (100%) rename {gtk-rs => gtk4-rs}/gtk-rs-dialogs/Cargo.toml (100%) rename {gtk-rs => gtk4-rs}/gtk-rs-dialogs/src/main.rs (100%) rename {gtk-rs => gtk4-rs}/gtk-rs-media/.vscode/launch.json (100%) rename {gtk-rs => gtk4-rs}/gtk-rs-media/Cargo.lock (100%) rename {gtk-rs => gtk4-rs}/gtk-rs-media/Cargo.toml (100%) create mode 100644 gtk4-rs/gtk-rs-media/gtk-rs-media.code-workspace rename {gtk-rs => gtk4-rs}/gtk-rs-media/src/main.rs (100%) diff --git a/Gtkmm3/gtk117_colorpicker/src/MyWin.cc b/Gtkmm3/gtk117_colorpicker/src/MyWin.cc index b94d8bd..35e3718 100644 --- a/Gtkmm3/gtk117_colorpicker/src/MyWin.cc +++ b/Gtkmm3/gtk117_colorpicker/src/MyWin.cc @@ -127,7 +127,7 @@ void MyWin::get_pixel_color(int x,int y){ if(sized->get_has_alpha()){ color_str = Glib::ustring(g_strdup_printf("#%02X%02X%02X%02X",red,blue,green,alpha)); }else{ - color_str = Glib::ustring(g_strdup_printf("#%02X%02X%02X",red,blue,green)); + color_str = Glib::ustring(g_strdup_printf("#%02X%02X%02X",red,green,blue)); } label_color_str.set_label(color_str); } diff --git a/README.md b/README.md index 1ef3e9f..8f0fb38 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,35 @@ # testing-repository -A testing repository +## A testing repository -[Experimental]: After gtk112 and gtk113, the submodule GCR_CMake is imported +[Experimental]: The rust programming language is imported for some codes + +[News]: After gtk112 and gtk113, the submodule GCR_CMake is imported Thanks for the project author https://github.com/Makman2/GCR_CMake (Actually, I forked the project for convenience) +### These contents are outdated: + Note: To minimize the repeated files,I put the same files as public resource -The file name is above: public\_res\\_\ or public\_res\\_\ +The file name is above: + +public\_res\\_\ or public\_res\\_\ + +~~Please compile with g++ or gcc (Clang is also supported) -Please compile with g++ or gcc (Clang is also supported) (Visual Studio may have issues) Ege dircitory need ege 19.01 and above to complie C/C++ code using gtk2 needs gtk 2.24.10 -Gtk3 codes: +#### For Gtk3 codes: before gtk17 supports Gtk3.6.4 gtk17 and above removed support for gtk3.18 and below -Win32 exe supports WinXP and above +Win32 exe supports WinXP and above diff --git a/gtk-rs/gtk-rs-dialogs/.gitignore b/gtk4-rs/gtk-rs-dialogs/.gitignore similarity index 100% rename from gtk-rs/gtk-rs-dialogs/.gitignore rename to gtk4-rs/gtk-rs-dialogs/.gitignore diff --git a/gtk-rs/gtk-rs-dialogs/.vscode/launch.json b/gtk4-rs/gtk-rs-dialogs/.vscode/launch.json similarity index 100% rename from gtk-rs/gtk-rs-dialogs/.vscode/launch.json rename to gtk4-rs/gtk-rs-dialogs/.vscode/launch.json diff --git a/gtk-rs/gtk-rs-dialogs/Cargo.lock b/gtk4-rs/gtk-rs-dialogs/Cargo.lock similarity index 100% rename from gtk-rs/gtk-rs-dialogs/Cargo.lock rename to gtk4-rs/gtk-rs-dialogs/Cargo.lock diff --git a/gtk-rs/gtk-rs-dialogs/Cargo.toml b/gtk4-rs/gtk-rs-dialogs/Cargo.toml similarity index 100% rename from gtk-rs/gtk-rs-dialogs/Cargo.toml rename to gtk4-rs/gtk-rs-dialogs/Cargo.toml diff --git a/gtk-rs/gtk-rs-dialogs/src/main.rs b/gtk4-rs/gtk-rs-dialogs/src/main.rs similarity index 100% rename from gtk-rs/gtk-rs-dialogs/src/main.rs rename to gtk4-rs/gtk-rs-dialogs/src/main.rs diff --git a/gtk-rs/gtk-rs-media/.vscode/launch.json b/gtk4-rs/gtk-rs-media/.vscode/launch.json similarity index 100% rename from gtk-rs/gtk-rs-media/.vscode/launch.json rename to gtk4-rs/gtk-rs-media/.vscode/launch.json diff --git a/gtk-rs/gtk-rs-media/Cargo.lock b/gtk4-rs/gtk-rs-media/Cargo.lock similarity index 100% rename from gtk-rs/gtk-rs-media/Cargo.lock rename to gtk4-rs/gtk-rs-media/Cargo.lock diff --git a/gtk-rs/gtk-rs-media/Cargo.toml b/gtk4-rs/gtk-rs-media/Cargo.toml similarity index 100% rename from gtk-rs/gtk-rs-media/Cargo.toml rename to gtk4-rs/gtk-rs-media/Cargo.toml diff --git a/gtk4-rs/gtk-rs-media/gtk-rs-media.code-workspace b/gtk4-rs/gtk-rs-media/gtk-rs-media.code-workspace new file mode 100644 index 0000000..517e0b2 --- /dev/null +++ b/gtk4-rs/gtk-rs-media/gtk-rs-media.code-workspace @@ -0,0 +1,8 @@ +{ + "folders": [ + { + "path": "." + } + ], + "settings": {} +} \ No newline at end of file diff --git a/gtk-rs/gtk-rs-media/src/main.rs b/gtk4-rs/gtk-rs-media/src/main.rs similarity index 100% rename from gtk-rs/gtk-rs-media/src/main.rs rename to gtk4-rs/gtk-rs-media/src/main.rs