diff --git a/Sources/GuiTools/MainWindows/MainWindows.cpp b/Sources/GuiTools/MainWindows/MainWindows.cpp index 41da3e4..8988ad1 100644 --- a/Sources/GuiTools/MainWindows/MainWindows.cpp +++ b/Sources/GuiTools/MainWindows/MainWindows.cpp @@ -40,8 +40,20 @@ MainWindows::MainWindows(void) : MsgBroadcast("Main Windows", EDN_CAT_GUI) m_mainWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL); // select the program icone - gtk_window_set_default_icon_name("text-editor"); + GError *err = NULL; + Edn::String iconeFile; +#ifdef NDEBUG + iconeFile = "/usr/share/edn/images/icone.png"; +#else + iconeFile = "./data/data/imagesSources/icone.png"; +#endif + GdkPixbuf * icone = gdk_pixbuf_new_from_file(iconeFile.c_str(), &err); + if (err != NULL) { + gtk_window_set_default_icon_name("text-editor"); + } else { + gtk_window_set_icon(GTK_WINDOW(m_mainWindow), icone); + } // Default size open windows gtk_window_set_default_size(GTK_WINDOW(m_mainWindow), 800, 600); diff --git a/Sources/GuiTools/MainWindows/MenuBar.cpp b/Sources/GuiTools/MainWindows/MenuBar.cpp index c20f3a8..4be4f5a 100644 --- a/Sources/GuiTools/MainWindows/MenuBar.cpp +++ b/Sources/GuiTools/MainWindows/MenuBar.cpp @@ -204,12 +204,12 @@ MenuBar::MenuBar(void) : MsgBroadcast("Menu bar", EDN_CAT_GUI) tmp->AddGen(GTK_STOCK_NEW, "ctrl+n", EDN_MSG__NEW, true); tmp->AddGen(GTK_STOCK_OPEN, "ctrl+o", EDN_MSG__GUI_SHOW_OPEN_FILE, true); tmp->AddSeparator(); - tmp->AddGen("Close file", NULL, EDN_MSG__CURRENT_CLOSE, true); + tmp->AddGen("Close file", "ctrl+q", EDN_MSG__CURRENT_CLOSE, true); tmp->AddSeparator(); tmp->AddGen(GTK_STOCK_SAVE, "ctrl+s", EDN_MSG__CURRENT_SAVE, true); tmp->AddGen(GTK_STOCK_SAVE_AS, "ctrl+shift+s", EDN_MSG__CURRENT_SAVE_AS, true); tmp->AddSeparator(); - tmp->AddGen(GTK_STOCK_QUIT, "ctrl+q", EDN_MSG__QUIT, true); + tmp->AddGen(GTK_STOCK_QUIT, "ctrl+shift+q", EDN_MSG__QUIT, true); m_listMenu.PushBack(tmp); tmp = new MenuBarMain("_Edit", m_mainWidget); @@ -220,7 +220,7 @@ MenuBar::MenuBar(void) : MsgBroadcast("Menu bar", EDN_CAT_GUI) tmp->AddGen(GTK_STOCK_COPY, "ctrl+c", EDN_MSG__CURRENT_COPY, true, COPY_STD); tmp->AddGen(GTK_STOCK_PASTE, "ctrl+v", EDN_MSG__CURRENT_PASTE, true, COPY_STD); // tmp->AddGen(GTK_STOCK_DELETE, NULL); - tmp->AddGen("Remove line", "ctrl+d", EDN_MSG__CURRENT_REMOVE_LINE, true); + tmp->AddGen("Remove line", "ctrl+w", EDN_MSG__CURRENT_REMOVE_LINE, true); tmp->AddSeparator(); tmp->AddGen(GTK_STOCK_SELECT_ALL, "ctrl+a", EDN_MSG__CURRENT_SELECT_ALL, true); tmp->AddGen("Unselect", "ctrl+shift+a", EDN_MSG__CURRENT_UN_SELECT, true); @@ -260,8 +260,8 @@ MenuBar::MenuBar(void) : MsgBroadcast("Menu bar", EDN_CAT_GUI) tmp->AddGen("load Ctags file", NULL, EDN_MSG__OPEN_CTAGS, true); tmp->AddGen("re-load Ctags file", NULL, EDN_MSG__RELOAD_CTAGS, true); tmp->AddSeparator(); - tmp->AddGen("Find Definition", "ctrl+u", EDN_MSG__JUMP_TO_CURRENT_SELECTION, true); - tmp->AddGen("Back previous", "ctrl+y", EDN_MSG__JUMP_BACK, true); + tmp->AddGen("Find Definition", "ctrl+d", EDN_MSG__JUMP_TO_CURRENT_SELECTION, true); + tmp->AddGen("Back previous", "ctrl+shift+d", EDN_MSG__JUMP_BACK, true); /* tmp->AddGen("Gestion Ctags", NULL); tmp->AddGen("Add Ctags Folder", NULL); diff --git a/Sources/init.cpp b/Sources/init.cpp index 8ddecaf..db53ef0 100644 --- a/Sources/init.cpp +++ b/Sources/init.cpp @@ -66,8 +66,6 @@ int main (int argc, char *argv[]) ClipBoard::Init(); Display::Init(); - //MainWindows *window = MainWindows::getInstance(); - // init ALL Singleton : (void)MsgBroadcastCore::getInstance(); diff --git a/data/imagesSources/icone.png b/data/imagesSources/icone.png new file mode 100644 index 0000000..379ff21 Binary files /dev/null and b/data/imagesSources/icone.png differ diff --git a/data/imagesSources/icone.xcf b/data/imagesSources/icone.xcf new file mode 100644 index 0000000..ef1cf26 Binary files /dev/null and b/data/imagesSources/icone.xcf differ