search and reset buttons added to ocal related features. fixed signals in import from ocal dialog.

(bzr r3544)

1 files changed, 30 insertions, 191 deletions

diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp
index b99a48fa9..ae2dbd315 100644
--- a/src/ui/dialog/ocaldialogs.cpp
+++ b/src/ui/dialog/ocaldialogs.cpp
@@ -38,10 +38,9 @@ namespace Dialog
 
  FileExportToOCALDialog *FileExportToOCALDialog::create(Gtk::Window& parentWindow, 
                                            FileDialogType fileTypes,
-                                           const Glib::ustring &title,
-                                           const Glib::ustring &default_key)
+                                           const Glib::ustring &title)
 {
-    FileExportToOCALDialog *dialog = new FileExportToOCALDialogImpl(parentWindow, fileTypes, title, default_key);
+    FileExportToOCALDialog *dialog = new FileExportToOCALDialogImpl(parentWindow, fileTypes, title);
     return dialog;
 }
 
@@ -103,69 +102,13 @@ void FileExportToOCALDialogImpl::fileNameEntryChangedCallback()
 
 
 
-/**
- * Callback for fileNameEntry widget
- */
-void FileExportToOCALDialogImpl::fileTypeChangedCallback()
-{
-    int sel = fileTypeComboBox.get_active_row_number();
-    if (sel<0 || sel >= (int)fileTypes.size())
-        return;
-    FileType type = fileTypes[sel];
-
-    extension = type.extension;
-    updateNameAndExtension();
-}
-
-
-
-void FileExportToOCALDialogImpl::createFileTypeMenu()
-{
-    Inkscape::Extension::DB::OutputList extension_list;
-    Inkscape::Extension::db.get_output_list(extension_list);
-    knownExtensions.clear();
-
-    for (Inkscape::Extension::DB::OutputList::iterator current_item = extension_list.begin();
-         current_item != extension_list.end(); current_item++)
-    {
-        Inkscape::Extension::Output * omod = *current_item;
-
-        // FIXME: would be nice to grey them out instead of not listing them
-        if (omod->deactivated()) continue;
-
-        FileType type;
-        type.name     = (_(omod->get_filetypename()));
-        type.pattern  = "*";
-        Glib::ustring extension = omod->get_extension();
-        knownExtensions.insert( extension.casefold() );
-        fileDialogExtensionToPattern (type.pattern, extension);
-        type.extension= omod;
-        fileTypeComboBox.append_text(type.name);
-        fileTypes.push_back(type);
-    }
-
-    //#Let user choose
-    FileType guessType;
-    guessType.name = _("Guess from extension");
-    guessType.pattern = "*";
-    guessType.extension = NULL;
-    fileTypeComboBox.append_text(guessType.name);
-    fileTypes.push_back(guessType);
-
-
-    fileTypeComboBox.set_active(0);
-    fileTypeChangedCallback(); //call at least once to set the filter
-}
-
-
 
 /**
  * Constructor
  */
 FileExportToOCALDialogImpl::FileExportToOCALDialogImpl(Gtk::Window &parentWindow,
             FileDialogType fileTypes,
-            const Glib::ustring &title,
-            const Glib::ustring &default_key) :
+            const Glib::ustring &title) :
     FileDialogOCALBase(title)
 {
     /*
@@ -191,28 +134,11 @@ FileExportToOCALDialogImpl::FileExportToOCALDialogImpl(Gtk::Window &parentWindow
     fileBox.pack_start(*fileNameEntry, Gtk::PACK_EXPAND_WIDGET, 3);
     vbox->pack_start(fileBox);
 
-    //###### Do we want the .xxx extension automatically added?
-    fileTypeCheckbox.set_label(Glib::ustring(_("Append filename extension automatically")));
-    fileTypeCheckbox.set_active( (bool)prefs_get_int_attribute("dialogs.export",
-                                                               "append_extension", 1) );
-
-    createFileTypeMenu();
-
-    fileTypeComboBox.set_size_request(200,40);
-    fileTypeComboBox.signal_changed().connect(
-        sigc::mem_fun(*this, &FileExportToOCALDialogImpl::fileTypeChangedCallback) );
-
-    checksBox.pack_start( fileTypeCheckbox );
-    vbox->pack_start( checksBox );
-
-    vbox->pack_end( fileTypeComboBox );
-
     //Let's do some customization
     fileNameEntry = NULL;
     Gtk::Container *cont = get_toplevel();
     std::vector<Gtk::Entry *> entries;
     findEntryWidgets(cont, entries);
-    //g_message("Found %d entry widgets\n", entries.size());
     if (entries.size() >=1 )
         {
         //Catch when user hits [return] on the text field
@@ -221,18 +147,6 @@ FileExportToOCALDialogImpl::FileExportToOCALDialogImpl(Gtk::Window &parentWindow
              sigc::mem_fun(*this, &FileExportToOCALDialogImpl::fileNameEntryChangedCallback) );
         }
 
-    //Let's do more customization
-    std::vector<Gtk::Expander *> expanders;
-    findExpanderWidgets(cont, expanders);
-    //g_message("Found %d expander widgets\n", expanders.size());
-    if (expanders.size() >=1 )
-        {
-        //Always show the file list
-        Gtk::Expander *expander = expanders[0];
-        expander->set_expanded(true);
-        }
-
-
     add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
     set_default(*add_button(Gtk::Stock::SAVE,   Gtk::RESPONSE_OK));
 
@@ -248,8 +162,6 @@ FileExportToOCALDialogImpl::~FileExportToOCALDialogImpl()
 {
 }
 
-
-
 /**
  * Show this dialog modally.  Return true if user hits [OK]
  */
@@ -263,8 +175,6 @@ FileExportToOCALDialogImpl::show()
 
     if (b == Gtk::RESPONSE_OK)
     {
-        updateNameAndExtension();
-
         return TRUE;
         }
     else
@@ -273,58 +183,6 @@ FileExportToOCALDialogImpl::show()
         }
 }
 
-
-/**
- * Get the file extension type that was selected by the user. Valid after an [OK]
- */
-Inkscape::Extension::Extension *
-FileExportToOCALDialogImpl::getSelectionType()
-{
-    return extension;
-}
-
-void FileExportToOCALDialogImpl::setSelectionType( Inkscape::Extension::Extension * key )
-{
-    // If no pointer to extension is passed in, look up based on filename extension.
-    if ( !key ) {
-        // Not quite UTF-8 here.
-        gchar *filenameLower = g_ascii_strdown(myFilename.c_str(), -1);
-        for ( int i = 0; !key && (i < (int)fileTypes.size()); i++ ) {
-            Inkscape::Extension::Output *ext = dynamic_cast<Inkscape::Extension::Output*>(fileTypes[i].extension);
-            if ( ext && ext->get_extension() ) {
-                gchar *extensionLower = g_ascii_strdown( ext->get_extension(), -1 );
-                if ( g_str_has_suffix(filenameLower, extensionLower) ) {
-                    key = fileTypes[i].extension;
-                }
-                g_free(extensionLower);
-            }
-        }
-        g_free(filenameLower);
-    }
-
-    // Ensure the proper entry in the combo box is selected.
-    if ( key ) {
-        extension = key;
-        gchar const * extensionID = extension->get_id();
-        if ( extensionID ) {
-            for ( int i = 0; i < (int)fileTypes.size(); i++ ) {
-                Inkscape::Extension::Extension *ext = fileTypes[i].extension;
-                if ( ext ) {
-                    gchar const * id = ext->get_id();
-                    if ( id && ( strcmp(extensionID, id) == 0) ) {
-                        int oldSel = fileTypeComboBox.get_active_row_number();
-                        if ( i != oldSel ) {
-                            fileTypeComboBox.set_active(i);
-                        }
-                        break;
-                    }
-                }
-            }
-        }
-    }
-}
-
-
 /**
  * Get the file name chosen by the user.   Valid after an [OK]
  */
@@ -332,7 +190,9 @@ Glib::ustring
 FileExportToOCALDialogImpl::getFilename()
 {
     myFilename = fileNameEntry->get_text();
-    updateNameAndExtension();
+    if (!Glib::get_charset()) //If we are not utf8
+        myFilename = Glib::filename_to_utf8(myFilename);
+
     return myFilename;
 }
 
@@ -343,40 +203,6 @@ FileExportToOCALDialogImpl::change_title(const Glib::ustring& title)
     this->set_title(title);
 }
 
-void FileExportToOCALDialogImpl::updateNameAndExtension()
-{
-    // Pick up any changes the user has typed in.
-    Glib::ustring tmp = myFilename;   // get_filename();
-
-    Inkscape::Extension::Output* newOut = extension ? dynamic_cast<Inkscape::Extension::Output*>(extension) : 0;
-    if ( fileTypeCheckbox.get_active() && newOut ) {
-        try {
-            bool appendExtension = true;
-            Glib::ustring utf8Name = Glib::filename_to_utf8( myFilename );
-            Glib::ustring::size_type pos = utf8Name.rfind('.');
-            if ( pos != Glib::ustring::npos ) {
-                Glib::ustring trail = utf8Name.substr( pos );
-                Glib::ustring foldedTrail = trail.casefold();
-                if ( (trail == ".")
-                     | (foldedTrail != Glib::ustring( newOut->get_extension() ).casefold()
-                        && ( knownExtensions.find(foldedTrail) != knownExtensions.end() ) ) ) {
-                    utf8Name = utf8Name.erase( pos );
-                } else {
-                    appendExtension = false;
-                }
-            }
-
-            if (appendExtension) {
-                utf8Name = utf8Name + newOut->get_extension();
-                myFilename = Glib::filename_from_utf8( utf8Name );
-
-            }
-        } catch ( Glib::ConvertError& e ) {
-            // ignore
-        }
-    }
-}
-
 
 //########################################################################
 //# F I L E    E X P O R T   T O   O C A L   P A S S W O R D
@@ -405,14 +231,12 @@ FileExportToOCALPasswordDialogImpl::FileExportToOCALPasswordDialogImpl(Gtk::Wind
     usernameEntry = new Gtk::Entry();
     usernameEntry->set_text(myUsername);
     usernameEntry->set_max_length(255);
-    //usernameEntry->set_alignment(1);
 
     passwordEntry = new Gtk::Entry();
     passwordEntry->set_text(myPassword);
     passwordEntry->set_max_length(255);
     passwordEntry->set_invisible_char('*');
     passwordEntry->set_visibility(false);
-    //passwordEntry->set_alignment(1);
     passwordEntry->set_activates_default(true);
 
     userBox.pack_start(*userLabel);
@@ -489,19 +313,20 @@ FileExportToOCALPasswordDialogImpl::change_title(const Glib::ustring& title)
 //### F I L E   I M P O R T   F R O M   O C A L
 //#########################################################################
 
-
 /*
- * Callback for row activated
+ * Calalback for cursor chage
  */
-void FileListViewText::on_row_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column)
+void FileListViewText::on_cursor_changed()
 {
     // create file path
     myFilename = Glib::get_tmp_dir();
     myFilename.append(G_DIR_SEPARATOR_S);
+    std::vector<Gtk::TreeModel::Path> pathlist;
+    pathlist = this->get_selection()->get_selected_rows();
     std::vector<int> posArray(1);
-    posArray = path.get_indices();
+    posArray = pathlist[0].get_indices();
     myFilename.append(get_text(posArray[0], 2));
-    
+
 #ifdef WITH_GNOME_VFS
     gnome_vfs_init();
     GnomeVFSHandle    *from_handle = NULL;
@@ -575,6 +400,16 @@ void FileListViewText::on_row_activated(const Gtk::TreeModel::Path& path, Gtk::T
 
 
 /*
+ * Callback for row activated
+ */
+void FileListViewText::on_row_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column)
+{
+    this->on_cursor_changed();
+    myButton->activate();
+}
+
+
+/*
  * Returns the selected filename
  */
 Glib::ustring FileListViewText::getFilename()
@@ -762,6 +597,8 @@ FileImportFromOCALDialogImplGtk::FileImportFromOCALDialogImplGtk(Gtk::Window& pa
     Gtk::Label *tagLabel = new Gtk::Label(_("Search Tag"));
     notFoundLabel = new Gtk::Label(_("No files matched your search"));
     descriptionLabel = new Gtk::Label();
+    descriptionLabel->set_max_width_chars(60);
+    descriptionLabel->set_single_line_mode(false);
     messageBox.pack_start(*notFoundLabel);
     descriptionBox.pack_start(*descriptionLabel);
     searchTagEntry = new Gtk::Entry();
@@ -773,7 +610,12 @@ FileImportFromOCALDialogImplGtk::FileImportFromOCALDialogImplGtk(Gtk::Window& pa
     tagBox.pack_start(*searchButton);
     filesPreview = new SVGPreview();
     filesPreview->showNoPreview();
-    filesList = new FileListViewText(5, *filesPreview, *descriptionLabel);
+    // add the buttons in the bottom of the dialog
+    add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+    okButton = add_button(Gtk::Stock::OPEN,   Gtk::RESPONSE_OK);
+    // sets the okbutton to default
+    set_default(*okButton);
+    filesList = new FileListViewText(5, *filesPreview, *descriptionLabel, *okButton);
     filesList->set_sensitive(false);
     // add the listview inside a ScrolledWindow
     listScrolledWindow.add(*filesList);
@@ -808,9 +650,6 @@ FileImportFromOCALDialogImplGtk::FileImportFromOCALDialogImplGtk(Gtk::Window& pa
     searchButton->signal_clicked().connect(
             sigc::mem_fun(*this, &FileImportFromOCALDialogImplGtk::searchTagEntryChangedCallback));
 
-    add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
-    set_default(*add_button(Gtk::Stock::OPEN,   Gtk::RESPONSE_OK));
-
     show_all_children();
     notFoundLabel->hide();
 }