diff --git a/data/pcmanfm.conf b/data/pcmanfm.conf index 2fd42dd..223707c 100644 --- a/data/pcmanfm.conf +++ b/data/pcmanfm.conf @@ -14,9 +14,19 @@ desktop_shadow=#000000 show_wm_menu=0 [ui] -win_width=640 -win_height=480 +win_width=1300 +win_height=985 +maximized=1 +splitter_pos=252 +media_in_new_tab=0 +desktop_folder_new_win=0 +change_tab_on_drop=1 +close_on_unmount=0 +focus_previous=1 side_pane_mode=places -view_mode=icon -show_hidden=0 +view_mode=list +show_hidden=1 sort=name;ascending; +toolbar=newtab;navigation; +show_statusbar=1 +pathbar_mode_buttons=0 diff --git a/po/hu.po b/po/hu.po index 6b7bc58..8222990 100644 --- a/po/hu.po +++ b/po/hu.po @@ -839,9 +839,9 @@ msgstr "" msgid "Fil_ter..." msgstr "" -#: ../src/main-win-ui.c:230 +#: ../src/main-win-ui.c:230 # I drop the leading _ in favor of the new Alt S hotkey. msgid "_Help" -msgstr "_Súgó" +msgstr "Súgó" #: ../src/main-win-ui.c:232 msgid "_Keyboard Navigation" diff --git a/src/main-win-ui.c b/src/main-win-ui.c index 8ca7424..91e52c8 100644 --- a/src/main-win-ui.c +++ b/src/main-win-ui.c @@ -153,6 +153,7 @@ static const char main_menu_xml[] = "" "" "" + "" #if FM_CHECK_VERSION(1, 0, 2) "" #endif @@ -178,11 +179,14 @@ static const char main_menu_xml[] = "" "" "" +"" "" "" "" "" -""; +"" +"" +""; /* For actions that are bounced to FmFolderView - check accels for accordance */ static GtkActionEntry main_win_actions[]= @@ -193,7 +197,7 @@ static GtkActionEntry main_win_actions[]= {"CreateNew", GTK_STOCK_ADD, N_("C_reate New..."), "", NULL, NULL}, {"NewFolder", "folder", N_("Folder"), "N", NULL, G_CALLBACK(bounce_action)}, {"NewBlank", NULL, N_("Empty File"), "N", NULL, G_CALLBACK(bounce_action)}, - {"Prop", GTK_STOCK_PROPERTIES, N_("Folder Propertie_s"), NULL, NULL, G_CALLBACK(bounce_action)}, + {"Prop", GTK_STOCK_PROPERTIES, N_("Folder Propertie_s"), "P", NULL, G_CALLBACK(bounce_action)}, {"CloseTab", GTK_STOCK_CLOSE, N_("_Close Tab"), "W", NULL, G_CALLBACK(on_close_tab)}, {"Close", GTK_STOCK_QUIT, N_("Close _Window"), "Q", NULL, G_CALLBACK(on_close_win)}, {"EditMenu", NULL, N_("_Edit"), NULL, NULL, NULL}, @@ -203,16 +207,16 @@ static GtkActionEntry main_win_actions[]= {"Paste", GTK_STOCK_PASTE, NULL, NULL, NULL, G_CALLBACK(bounce_action)}, {"ToTrash", GTK_STOCK_DELETE, N_("Move to _Trash"), "", NULL, G_CALLBACK(on_trash)}, {"Del", GTK_STOCK_REMOVE, NULL, "", NULL, G_CALLBACK(on_del)}, - {"CopyPath", NULL, N_("Copy Pat_h(s)"), NULL, NULL, G_CALLBACK(on_copy_path)}, + {"CopyPath", NULL, N_("Copy Pat_h(s)"), "Insert", NULL, G_CALLBACK(on_copy_path)}, {"Rename", NULL, N_("R_ename..."), "F2", NULL, G_CALLBACK(on_rename)}, {"Duplicate", NULL, N_("D_uplicate..."), "U", NULL, NULL}, - {"Link", NULL, N_("Create Lin_k..."), NULL, NULL, G_CALLBACK(on_link)}, + {"Link", NULL, N_("Create Lin_k..."), "L", NULL, G_CALLBACK(on_link)}, {"MoveTo", NULL, N_("_Move to..."), NULL, NULL, G_CALLBACK(on_move_to)}, {"CopyTo", NULL, N_("Copy to_..."), NULL, NULL, G_CALLBACK(on_copy_to)}, {"FileProp", GTK_STOCK_PROPERTIES, N_("Propertie_s"), "Return", NULL, G_CALLBACK(bounce_action)}, {"SelAll", GTK_STOCK_SELECT_ALL, NULL, "A", NULL, G_CALLBACK(bounce_action)}, {"InvSel", NULL, N_("_Invert Selection"), "I", NULL, G_CALLBACK(bounce_action)}, - {"Pref", GTK_STOCK_PREFERENCES, N_("Prefere_nces"), NULL, NULL, G_CALLBACK(on_preference)}, + {"Pref", GTK_STOCK_PREFERENCES, N_("Prefere_nces"), "P" , NULL, G_CALLBACK(on_preference)}, {"ViewMenu", NULL, N_("_View"), NULL, NULL, NULL}, {"Reload", GTK_STOCK_REFRESH, N_("_Reload Folder"), "F5", N_("Reload current folder"), G_CALLBACK(on_reload)}, {"Toolbar", NULL, N_("Tool_bar"), NULL, NULL, NULL}, @@ -241,27 +245,33 @@ static GtkActionEntry main_win_actions[]= {"Apps", "system-software-install", N_("_Applications"), NULL, N_("Go to root of applications menu folder"), G_CALLBACK(on_go_apps)}, {"Computer", "computer", N_("Dev_ices"), NULL, N_("Go to list of devices connected to the computer"), G_CALLBACK(on_go_computer)}, {"Network", GTK_STOCK_NETWORK, N_("Net_work"), NULL, N_("Go to list of places on the network"), G_CALLBACK(on_go_network)}, - {"Location", GTK_STOCK_JUMP_TO, N_("_Go to Location..."), "L", NULL, G_CALLBACK(on_location)}, + {"Location", GTK_STOCK_JUMP_TO, N_("_Go to Location..."), NULL, NULL, G_CALLBACK(on_location)}, {"Connect", NULL, N_("_Connect to Server..."), NULL, N_("Open a window to choose remote folder location"), G_CALLBACK(on_go_connect)}, {"Go", GTK_STOCK_JUMP_TO, NULL, NULL, N_("Go to the path in the location bar"), G_CALLBACK(on_go)}, {"BookmarksMenu", NULL, N_("_Bookmarks"), NULL, NULL, NULL}, {"AddBookmark", GTK_STOCK_ADD, N_("_Add to Bookmarks..."), "D", N_("Add current folder to bookmarks list"), G_CALLBACK(on_add_bookmark)}, {"ToolMenu", NULL, N_("Too_ls"), NULL, NULL, NULL}, - {"Term", "utilities-terminal", N_("Open Current Folder in _Terminal"), "F4", NULL, G_CALLBACK(on_open_in_terminal)}, -#if FM_CHECK_VERSION(1, 0, 2) + {"Term", "utilities-terminal", N_("Open Current Folder in _Terminal"), "S", NULL, G_CALLBACK(on_open_in_terminal)}, + {"TermAltS", "utilities-terminal", N_("Open Current Folder in _Terminal"), "S", NULL, G_CALLBACK(on_open_in_terminal)}, // sadly this doesnt work, handles the event to focusing the main Menu entry that begins with S. + #if FM_CHECK_VERSION(1, 0, 2) {"Search", GTK_STOCK_FIND, N_("Fin_d Files..."), "F", N_("Open search dialog"), G_CALLBACK(on_search)}, #endif #if FM_CHECK_VERSION(1, 2, 0) - {"Launch", GTK_STOCK_EXECUTE, N_("_Run a Command in Current Folder..."), NULL, NULL, G_CALLBACK(on_launch)}, +// {"Launch", GTK_STOCK_EXECUTE, N_("_Run a Command in Current Folder..."), NULL, NULL, G_CALLBACK(on_launch)}, + {"Launch", GTK_STOCK_EXECUTE, N_("_Run a Command in Current Folder..."), "C", NULL, G_CALLBACK(on_launch)}, #endif /*{"AsRoot", GTK_STOCK_DIALOG_AUTHENTICATION, N_("Open Current Folder as _Root"), NULL, NULL, G_CALLBACK(on_open_as_root)},*/ /* for accelerators */ {"Location2", NULL, NULL, "d", NULL, G_CALLBACK(on_location)}, + {"Link2", NULL, N_("Create Lin_k..."), "K", NULL, G_CALLBACK(on_link)}, {"Prev2", NULL, NULL, "XF86Back", NULL, G_CALLBACK(on_go_back)}, {"Next2", NULL, NULL, "XF86Forward", NULL, G_CALLBACK(on_go_forward)}, {"Reload2", NULL, NULL, "R", NULL, G_CALLBACK(on_reload)}, {"SizeBigger2", NULL, NULL, "equal", NULL, G_CALLBACK(on_size_increment)}, {"SizeSmaller2", NULL, NULL, "minus", NULL, G_CALLBACK(on_size_decrement)}, + {"TermShiftS", NULL, NULL, "F4", NULL, G_CALLBACK(on_open_in_terminal)}, + {"TermShiftF4", NULL, NULL, "F4", NULL, G_CALLBACK(on_open_in_terminal)}, + }; /* main_win_toggle_actions+main_win_mode_actions - see 'ViewMenu' for mnemonics */ diff --git a/src/main-win.c b/src/main-win.c index 49fc53b..3702e9c 100644 --- a/src/main-win.c +++ b/src/main-win.c @@ -33,6 +33,9 @@ #include "pcmanfm.h" +#include +#include + #include "app-config.h" #include "main-win.h" #include "pref.h" @@ -1744,7 +1747,13 @@ static void on_link(GtkAction *act, FmMainWin *win) FmPathList *files = fm_folder_view_dup_selected_file_paths(win->folder_view); if (files) { - FmPath *dest = fm_select_folder(GTK_WINDOW(win), NULL); + /* Start the folder chooser in the directory of the first selected file */ + FmPath *first = fm_path_list_peek_head(files); + FmPath *default_parent = NULL; + if (first) + default_parent = fm_path_get_parent(first); + + FmPath *dest = fm_select_folder_with_default(GTK_WINDOW(win), default_parent, NULL); if (dest) { fm_link_files(GTK_WINDOW(win), files, dest); @@ -1807,22 +1816,12 @@ static void on_del(GtkAction* act, FmMainWin* win) static void on_copy_path(GtkAction* action, FmMainWin* win) { - GdkDisplay *dpy = gtk_widget_get_display(GTK_WIDGET(win)); - GtkClipboard *clipboard = gtk_clipboard_get_for_display(dpy, GDK_SELECTION_CLIPBOARD); - GString *str = g_string_sized_new(128); FmPathList *files = fm_folder_view_dup_selected_file_paths(win->folder_view); - GList *fl; - - for (fl = fm_path_list_peek_head_link(files); fl; fl = fl->next) + if(files) { - char *path = fm_path_to_str(fl->data); - if (str->len > 0) - g_string_append_c(str, '\n'); - g_string_append(str, path); - g_free(path); + fm_clipboard_copy_paths_as_text(GTK_WIDGET(win), files); + fm_path_list_unref(files); } - gtk_clipboard_set_text(clipboard, str->str, str->len); - g_string_free(str, TRUE); } static void on_preference(GtkAction* act, FmMainWin* win)