allow choosing download destination

panthera-www.cc

@@ -317,6 +317,8 @@ private:

                                
                                
                                
                            
                                
                                    
                                        
                                            317  
                                                static void on_forward_pressed(GtkGestureClick* gesture, int n_press, double x, double y, gpointer user_data);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            318  
                                                static gboolean on_decide_policy(WebKitWebView* source, WebKitPolicyDecision* decision, WebKitPolicyDecisionType type, gpointer user_data);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            319  
                                                static void close_callback(WebKitWebView *source, gpointer user_data);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        320 +
                                            static void download_callback(WebKitNetworkSession *source, WebKitDownload *download, gpointer user_data);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        321 +
                                            static bool decide_destination_callback(WebKitDownload *download, gchar* suggested_filename, gpointer user_data);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            322  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            323  
                                            protected:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            324  
                                                void on_startup() override;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -814,6 +816,35 @@ void PantheraWww::close_callback(WebKitWebView *source, gpointer user_data) {

                                
                                
                                
                            
                                
                                    
                                        
                                            816  
                                                }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            817  
                                            }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            818  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        819 +
                                        void PantheraWww::download_callback(WebKitNetworkSession *source, WebKitDownload *download, gpointer user_data) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        820 +
                                            if(auto self = static_cast<PantheraWww*>(user_data)) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        821 +
                                                // TODO: free the WebKitDownload
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        822 +
                                                g_signal_connect(download, "decide-destination", G_CALLBACK(decide_destination_callback), self);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        823 +
                                            }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        824 +
                                        }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        825 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        826 +
                                        bool PantheraWww::decide_destination_callback(WebKitDownload *download, gchar *suggested_filename, gpointer user_data) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        827 +
                                            if(auto self = static_cast<PantheraWww*>(user_data)) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        828 +
                                                auto file_dialog = Gtk::FileDialog::create();
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        829 +
                                                file_dialog->set_accept_label(_("Download"));
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        830 +
                                                file_dialog->set_modal(false);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        831 +
                                                file_dialog->set_initial_name(std::string(suggested_filename));
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        832 +
                                                if(auto *window = dynamic_cast<Gtk::Window*>(Glib::wrap_auto(G_OBJECT(gtk_widget_get_root(GTK_WIDGET(webkit_download_get_web_view(download))))))) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        833 +
                                                    file_dialog->save(*window, Gio::SlotAsyncReady([file_dialog, download](Glib::RefPtr<Gio::AsyncResult> &result) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        834 +
                                                        try {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        835 +
                                                            auto file = file_dialog->save_finish(result);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        836 +
                                                            webkit_download_set_destination(download, file->get_path().c_str());
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        837 +
                                                        } catch(Gtk::DialogError &e) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        838 +
                                                            // Download rejected
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        839 +
                                                        }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        840 +
                                                    }));
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        841 +
                                                }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        842 +
                                                //g_free(suggested_filename);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        843 +
                                                return true;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        844 +
                                            }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        845 +
                                            return true;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        846 +
                                        }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        847 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            848  
                                            void PantheraWww::on_new_tab(gPanthera::ContentStack *stack, const Glib::ustring &url, bool focus, bool new_window) {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            849  
                                                if(!stack) {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            850  
                                                    // Find the current area
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -845,10 +876,10 @@ void PantheraWww::on_new_tab(gPanthera::ContentStack *stack, const Glib::ustring

                                
                                
                                
                            
                                
                                    
                                        
                                            876  
                                                g_signal_connect(webview, "load-changed", G_CALLBACK(load_change_callback), this);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            877  
                                                g_signal_connect(webview, "decide-policy", G_CALLBACK(on_decide_policy), this);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            878  
                                                webkit_web_view_load_uri(webview, url_.data());
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        848 -
                                            auto cookie_manager = webkit_network_session_get_cookie_manager(webkit_web_view_get_network_session(webview));
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        879 +
                                            auto cookie_manager = webkit_network_session_get_cookie_manager(webkit_network_session_get_default());
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            880  
                                                webkit_cookie_manager_set_persistent_storage(cookie_manager, cookie_file.c_str(), WEBKIT_COOKIE_PERSISTENT_STORAGE_TEXT);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            881  
                                                webkit_cookie_manager_set_accept_policy(cookie_manager, WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        851 -
                                            auto website_data_manager = webkit_network_session_get_website_data_manager(webkit_web_view_get_network_session(webview));
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        882 +
                                            auto website_data_manager = webkit_network_session_get_website_data_manager(webkit_network_session_get_default());
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            883  
                                                webkit_website_data_manager_set_favicons_enabled(website_data_manager, true);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            884  
                                                GtkEventController *click_controller_back = GTK_EVENT_CONTROLLER(gtk_gesture_click_new());
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            885  
                                                gtk_gesture_single_set_button(GTK_GESTURE_SINGLE(click_controller_back), 8);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -1010,6 +1041,9 @@ void PantheraWww::on_startup() {

                                
                                
                                
                            
                                
                                    
                                        
                                            1041  
                                                main_menu->append_submenu(_("_Go"), go_menu);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1042  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1043  
                                                set_menubar(main_menu);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1044 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1045 +
                                            // Download handling
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1046 +
                                            g_signal_connect(webkit_network_session_get_default(), "download-started", G_CALLBACK(download_callback), this);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1047  
                                            }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1048  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1049  
                                            void PantheraWww::on_activate() {