Fix various minor PS issues

[wxWidgets.git] / src / gtk / dirdlg.cpp

diff --git a/src/gtk/dirdlg.cpp b/src/gtk/dirdlg.cpp
index cebccbcb6db36606d03b3e6533997ce2f449cebe..846948571b754752aca96672a2348c1c63224af7 100644 (file)
--- a/src/gtk/dirdlg.cpp
+++ b/src/gtk/dirdlg.cpp
@@ -1,415 +1,208 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dirdlg.cpp
-// Purpose:     wxDirDialog
-// Author:      Harm van der Heijden and Robert Roebling
-// Modified by:
-// Created:     12/12/98
-// Copyright:   (c) Harm van der Heijden and Robert Roebling
-// Licence:    wxWindows licence
+// Name:        src/gtk/dirdlg.cpp
+// Purpose:     native implementation of wxDirDialog
+// Author:      Robert Roebling, Zbigniew Zagorski, Mart Raudsepp, Francesco Montorsi
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, 2004 Zbigniew Zagorski, 2005 Mart Raudsepp
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "dirdlg.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+
+
+/*
+  NOTE: the GtkFileChooser interface can be used both for wxFileDialog and for wxDirDialog.
+        Thus following code is very similar (even if not identic) to src/gtk/filedlg.cpp
+        If you find a problem in this code, remember to check also that file !
+*/
+
+
+
+#if wxUSE_DIRDLG && defined( __WXGTK24__ )

 
 

-#include "wx/defs.h"
-#include "wx/utils.h"
-#include "wx/dialog.h"
-#include "wx/button.h"
-#include "wx/layout.h"
-#include "wx/msgdlg.h"
-#include "wx/textdlg.h"
-#include "wx/filefn.h"
-#include "wx/cmndata.h"
-#include "wx/gdicmn.h"

 #include "wx/dirdlg.h"
 #include "wx/dirdlg.h"

-#include "wx/intl.h"
-#include "wx/imaglist.h"
-
-
-/* XPM */
-static char * icon1_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"16 16 6 1",
-/* colors */
-"      s None  c None",
-".     c #000000",
-"+     c #c0c0c0",
-"@     c #808080",
-"#     c #ffff00",
-"$     c #ffffff",
-/* pixels */
-"                ",
-"   @@@@@        ",
-"  @#+#+#@       ",
-" @#+#+#+#@@@@@@ ",
-" @$$$$$$$$$$$$@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @@@@@@@@@@@@@@.",
-"  ..............",
-"                ",
-"                "};
-
-
-static const int ID_DIRCTRL = 1000;
-static const int ID_TEXTCTRL = 1001;
-static const int ID_OK = 1002;
-static const int ID_CANCEL = 1003;
-static const int ID_NEW = 1004;
-//static const int ID_CHECK = 1005;
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/filedlg.h"
+#endif
+
+#include "wx/gtk/private.h"
+
+#include <unistd.h> // chdir

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxDirItemData
+// "clicked" for OK-button

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-wxDirItemData::wxDirItemData(wxString& path, wxString& name)
+extern "C" {
+static void gtk_dirdialog_ok_callback(GtkWidget *widget, wxDirDialog *dialog)

 {
 {

-  m_path = new wxString(path);
-  m_name = new wxString(name);
-  /* Insert logic to detect hidden files here 
-   * In UnixLand we just check whether the first char is a dot 
-   * For FileNameFromPath read LastDirNameInThisPath ;-) */
-  // m_isHidden = (bool)(wxFileNameFromPath(*m_path)[0] == '.');
-  m_isHidden = FALSE;
-  m_hasSubDirs = HasSubDirs();
-}
+    // change to the directory where the user went if asked
+    if (dialog->HasFlag(wxDD_CHANGE_DIR))
+    {
+        wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)));
+        chdir(filename);
+    }

 
 

-wxDirItemData:: ~wxDirItemData()
-{
-  delete m_path;
-  delete m_name;
+    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
+    event.SetEventObject(dialog);
+    dialog->GetEventHandler()->ProcessEvent(event);

 }
 }

-
-bool wxDirItemData::HasSubDirs()
-{
-  wxString search = *m_path + "/*";
-  wxString path = wxFindFirstFile( search, wxDIR );
-  return (bool)(!path.IsNull());

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// wxDirCtrl
+// "clicked" for Cancel-button

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxDirCtrl,wxTreeCtrl)
-
-BEGIN_EVENT_TABLE(wxDirCtrl,wxTreeCtrl)
-  EVT_TREE_ITEM_EXPANDING     (-1, wxDirCtrl::OnExpandItem)
-  EVT_TREE_ITEM_COLLAPSED     (-1, wxDirCtrl::OnCollapseItem)
-END_EVENT_TABLE()
-
-wxDirCtrl::wxDirCtrl(void)
-{
-  m_showHidden = FALSE;
-};
-
-wxDirCtrl::wxDirCtrl(wxWindow *parent, const wxWindowID id, const wxString &WXUNUSED(dir),
-            const wxPoint& pos, const wxSize& size,
-            const long style, const wxString& name )
- :
-  wxTreeCtrl( parent, id, pos, size, style, wxDefaultValidator, name )
+extern "C" {
+static void gtk_dirdialog_cancel_callback(GtkWidget *WXUNUSED(w),
+                                           wxDirDialog *dialog)

 {
 {

-  m_imageListNormal = new wxImageList(16, 16, TRUE);
-  m_imageListNormal->Add(wxICON(icon1));
-  SetImageList(m_imageListNormal);
-  
-  m_showHidden = FALSE;
-  m_rootId = AddRoot("Sections");
-  SetItemHasChildren(m_rootId);
-  Expand(m_rootId); // automatically expand first level
-};
-
-/* Quick macro. Don't worry, I'll #undef it later */
-#define ADD_SECTION(a,b) \
-  if (wxPathExists((a))) { m_paths.Add( (a) ); m_names.Add( (b) ); };
-
-void wxDirCtrl::SetupSections() 
-{
-  wxString home;
-
-  m_paths.Clear();
-  m_names.Clear();
-  ADD_SECTION("/", _("The Computer") )
-  wxGetHomeDir(&home);
-  ADD_SECTION(home, _("My Home") )
-  ADD_SECTION("/mnt", _("Mounted Devices") )
-  ADD_SECTION("/usr", _("User") )
-  ADD_SECTION("/usr/local", _("User Local") )
-  ADD_SECTION("/var", _("Variables") )
-  ADD_SECTION("/etc", _("Etcetera") )
-  ADD_SECTION("/tmp", _("Temporary") )
+    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
+    event.SetEventObject(dialog);
+    dialog->GetEventHandler()->ProcessEvent(event);

 }
 }

-#undef ADD_SECTION
-
-void wxDirCtrl::CreateItems(const wxTreeItemId &parent)
-{
-  wxTreeItemId id;
-  wxDirItemData *dir_item;
-
-//  wxASSERT(m_paths.Count() == m_names.Count());  ?
-  
-  for (unsigned int i=0; i<m_paths.Count(); i++) 
-  {
-    dir_item = new wxDirItemData(m_paths[i],m_names[i]);
-    id = AppendItem( parent, m_names[i], 0, -1, dir_item);
-    if (dir_item->m_hasSubDirs) SetItemHasChildren(id);
-  }

 }
 
 }
 

-void wxDirCtrl::OnExpandItem( const wxTreeEvent &event )
+extern "C" {
+static void gtk_dirdialog_response_callback(GtkWidget *w,
+                                             gint response,
+                                             wxDirDialog *dialog)

 {
 {

-  if (event.GetItem() == m_rootId)
-  {
-    SetupSections();
-    CreateItems(m_rootId);
-    return;
-  };
-
-  // This may take a longish time. Go to busy cursor
-  wxBeginBusyCursor();
-
-  wxDirItemData *data = (wxDirItemData *)GetItemData(event.GetItem());
-  wxASSERT(data);
-
-  wxString search,path,filename;
-
-  m_paths.Clear();
-  m_names.Clear();
-  search = *(data->m_path) + "/*";
-  for (path = wxFindFirstFile( search, wxDIR ); !path.IsNull(); 
-       path=wxFindNextFile() ) {
-    filename = wxFileNameFromPath( path );
-    /* Don't add "." and ".." to the tree. I think wxFindNextFile
-     * also checks this, but I don't quite understand what happens
-     * there. Also wxFindNextFile seems to swallow hidden dirs */
-    if ((filename != ".") && (filename != "..")) {
-      m_paths.Add(path);
-      m_names.Add(filename);
-    }
-  }
-  CreateItems(event.GetItem());
-  wxEndBusyCursor();
-};
-
-
-void wxDirCtrl::OnCollapseItem( const wxTreeEvent &event )
-{
-  wxTreeItemId child, parent = event.GetItem();
-  long cookie;
-  /* Workaround because DeleteChildren has disapeared (why?) and
-   * CollapseAndReset doesn't work as advertised (deletes parent too) */
-  child = GetFirstChild(parent, cookie);
-  while (child.IsOk()) {
-    Delete(child);
-    /* Not GetNextChild below, because the cookie mechanism can't 
-     * handle disappearing children! */
-    child = GetFirstChild(parent, cookie);
-  }
-};
+    if (response == GTK_RESPONSE_ACCEPT)
+        gtk_dirdialog_ok_callback(w, dialog);
+    else // GTK_RESPONSE_CANCEL or GTK_RESPONSE_NONE
+        gtk_dirdialog_cancel_callback(w, dialog);
+}
+}

 
 //-----------------------------------------------------------------------------
 // wxDirDialog
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxDirDialog
 //-----------------------------------------------------------------------------
 

+IMPLEMENT_DYNAMIC_CLASS(wxDirDialog,wxGenericDirDialog)

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_CLASS(wxDirDialog, wxDialog)
-#else
-IMPLEMENT_DYNAMIC_CLASS( wxDirDialog, wxDialog )
-#endif
-
-BEGIN_EVENT_TABLE( wxDirDialog, wxDialog )
-  EVT_TREE_KEY_DOWN        (ID_DIRCTRL,   wxDirDialog::OnTreeKeyDown)
-  EVT_TREE_SEL_CHANGED     (ID_DIRCTRL,   wxDirDialog::OnTreeSelected)
-  EVT_SIZE                 (              wxDirDialog::OnSize)
-  EVT_BUTTON               (ID_OK,        wxDirDialog::OnOK)
-  EVT_BUTTON               (ID_CANCEL,    wxDirDialog::OnCancel)
-  EVT_BUTTON               (ID_NEW,       wxDirDialog::OnNew)
-  EVT_TEXT_ENTER           (ID_TEXTCTRL,  wxDirDialog::OnOK)
-  //  EVT_CHECKBOX             (ID_CHECK,     wxDirDialog::OnCheck)
+BEGIN_EVENT_TABLE(wxDirDialog,wxGenericDirDialog)
+    EVT_BUTTON(wxID_OK, wxDirDialog::OnFakeOk)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message,
-                        const wxString& defaultPath, long style, 
-                        const wxPoint& pos) : 
-  wxDialog(parent, -1, message, pos, wxSize(300,300),
-          wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL)
-{
-  m_message = message;
-  m_dialogStyle = style;
-  m_parent = parent;
-  
-  m_path = defaultPath;
-
-  m_dir = new wxDirCtrl( this, ID_DIRCTRL, "/", wxDefaultPosition, wxDefaultSize, wxTR_HAS_BUTTONS | wxSUNKEN_BORDER ); 
-  m_input = new wxTextCtrl( this, ID_TEXTCTRL, m_path, wxDefaultPosition ); 
-  // m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden") );
-  m_ok = new wxButton( this, ID_OK, _("OK") );
-  m_cancel = new wxButton( this, ID_CANCEL, _("Cancel") );
-  m_new = new wxButton( this, ID_NEW, _("New...") );
-
-  // m_check->SetValue(TRUE);
-  m_ok->SetDefault();
-  m_dir->SetFocus();
-
-  doSize();
-}
-
-void wxDirDialog::OnSize(wxSizeEvent& WXUNUSED(event))
-{
-  doSize();
+wxDirDialog::wxDirDialog(wxWindow* parent, const wxString& title,
+                        const wxString& defaultPath, long style,
+                        const wxPoint& pos, const wxSize& sz,
+                        const wxString& name)
+{
+    if (!gtk_check_version(2,4,0))
+    {
+        m_message = title;
+
+        parent = GetParentForModalDialog(parent);
+
+        if (!PreCreation(parent, pos, wxDefaultSize) ||
+            !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,
+                    wxDefaultValidator, wxT("dirdialog")))
+        {
+            wxFAIL_MSG( wxT("wxDirDialog creation failed") );
+            return;
+        }
+
+        GtkWindow* gtk_parent = NULL;
+        if (parent)
+            gtk_parent = GTK_WINDOW( gtk_widget_get_toplevel(parent->m_widget) );
+
+        m_widget = gtk_file_chooser_dialog_new(
+                       wxGTK_CONV(m_message),
+                       gtk_parent,
+                       GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+                       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                       GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+                       NULL);
+
+        gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_ACCEPT);
+
+        // gtk_widget_hide_on_delete is used here to avoid that Gtk automatically destroys
+        // the dialog when the user press ESC on the dialog: in that case a second call to
+        // ShowModal() would result in a bunch of Gtk-CRITICAL errors...
+        g_signal_connect (G_OBJECT(m_widget),
+                        "delete_event",
+                        G_CALLBACK (gtk_widget_hide_on_delete),
+                        (gpointer)this);
+
+        // local-only property could be set to false to allow non-local files to be loaded.
+        // In that case get/set_uri(s) should be used instead of get/set_filename(s) everywhere
+        // and the GtkFileChooserDialog should probably also be created with a backend,
+        // e.g "gnome-vfs", "default", ... (gtk_file_chooser_dialog_new_with_backend).
+        // Currently local-only is kept as the default - true:
+        // gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(m_widget), true);
+
+        g_signal_connect (m_widget, "response",
+            G_CALLBACK (gtk_dirdialog_response_callback), this);
+
+        if ( !defaultPath.empty() )
+            gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(m_widget),
+                    defaultPath.fn_str() );
+    }
+    else
+        wxGenericDirDialog::Create(parent, title, defaultPath, style, pos, sz, name);

 }
 
 }
 

-void wxDirDialog::doSize()
+void wxDirDialog::OnFakeOk( wxCommandEvent &event )

 {
 {

-  /* Figure out height of DirCtrl, which is what is left over by
-   * the textctrl and the buttons. Manually, because I can't seem
-   * to get the constraints stuff to do this */
-  int w,h,h2;
-
-  GetClientSize(&w, &h);
-  m_input->GetSize(&w,&h2); h -= h2;
-  m_ok->GetSize(&w, &h2); h -= h2;
-  //m_check->GetSize(&w, &h2); h -= h2;
-  h -= 20;
-
-  wxLayoutConstraints *c = new wxLayoutConstraints;
-  c->left.SameAs       (this, wxLeft,5);
-  c->right.SameAs        (this, wxRight,5);
-  c->height.Absolute    (h);
-  c->top.SameAs                (this, wxTop,5);
-  m_dir->SetConstraints(c);
-
-  c = new wxLayoutConstraints;
-  c->left.SameAs       (this, wxLeft,5);
-  c->right.SameAs        (this, wxRight,5);
-  c->height.AsIs       ();
-  c->top.Below         (m_dir,5);
-  m_input->SetConstraints(c);
-
-  /*  c = new wxLayoutConstraints;
-  c->left.SameAs       (this, wxLeft,5);
-  c->right.SameAs        (this, wxRight,5);
-  c->height.AsIs       ();
-  c->top.Below         (m_input,5);
-  m_check->SetConstraints(c); */
-
-  c = new wxLayoutConstraints;
-  c->width.SameAs      (m_cancel, wxWidth);
-  c->height.AsIs       ();
-  c->top.Below         (m_input,5);
-  c->centreX.PercentOf (this, wxWidth, 25);
-  m_ok->SetConstraints(c);
-
-  c = new wxLayoutConstraints;
-  c->width.SameAs      (m_cancel, wxWidth);
-  c->height.AsIs       ();
-  c->top.Below         (m_input,5);
-  c->bottom.SameAs      (this, wxBottom, 5);
-  c->centreX.PercentOf (this, wxWidth, 50);
-  m_new->SetConstraints(c);
-
-  c = new wxLayoutConstraints;
-  c->width.AsIs                ();
-  c->height.AsIs       ();
-  c->top.Below         (m_input,5);
-  c->centreX.PercentOf (this, wxWidth, 75);
-  m_cancel->SetConstraints(c);
-
-  Layout();
+    if (!gtk_check_version(2,4,0))
+        EndDialog(wxID_OK);
+    else
+        wxGenericDirDialog::OnOK( event );

 }
 
 int wxDirDialog::ShowModal()
 {
 }
 
 int wxDirDialog::ShowModal()
 {

-  m_input->SetValue( m_path );
-  return wxDialog::ShowModal();
+    if (!gtk_check_version(2,4,0))
+        return wxDialog::ShowModal();
+    else
+        return wxGenericDirDialog::ShowModal();

 }
 
 }
 

-void wxDirDialog::OnTreeSelected( wxTreeEvent &event )
-{
-  wxDirItemData *data = 
-    (wxDirItemData*)m_dir->GetItemData(event.GetItem());
-  if (data) 
-    m_input->SetValue( *(data->m_path) );
-};
-
-void wxDirDialog::OnTreeKeyDown( wxKeyEvent &WXUNUSED(event) )
+bool wxDirDialog::Show( bool show )

 {
 {

-  wxDirItemData *data = 
-    (wxDirItemData*)m_dir->GetItemData(m_dir->GetSelection());
-  if (data) 
-    m_input->SetValue( *(data->m_path) );
-};
-
-void wxDirDialog::OnOK( wxCommandEvent& WXUNUSED(event) )
-{
-  m_path = m_input->GetValue();
-  // Does the path exist? (User may have typed anything in m_input)
-  if (wxPathExists(m_path)) {
-    // OK, path exists, we're done.
-    EndModal(wxID_OK);
-    return;
-  }
-  // Interact with user, find out if the dir is a typo or to be created
-  wxString msg( _("The directory ") );
-  msg = msg + m_path;
-  msg = msg + _("\ndoes not exist\nCreate it now?") ;
-  wxMessageDialog dialog(this, msg, _("Directory does not exist"), wxYES_NO);
-  if ( dialog.ShowModal() == wxID_YES ) {
-    // Okay, let's make it
-    if (wxMkdir(m_path)) {
-      // The new dir was created okay.
-      EndModal(wxID_OK);
-      return;
-    }
-    else {
-      // Trouble...
-      msg = _("Failed to create directory ")+m_path+
-       _("\n(Do you have the required permissions?)");
-      wxMessageDialog errmsg(this, msg, _("Error creating directory"), wxOK);
-      errmsg.ShowModal();
-      // We still don't have a valid dir. Back to the main dialog.
-    }
-  }
-  // User has answered NO to create dir.
+    if (!gtk_check_version(2,4,0))
+        return wxDialog::Show( show );
+    else
+        return wxGenericDirDialog::Show( show );

 }
 
 }
 

-void wxDirDialog::OnCancel( wxCommandEvent& WXUNUSED(event) )
+void wxDirDialog::DoSetSize(int x, int y, int width, int height, int sizeFlags)

 {
 {

-  EndModal(wxID_CANCEL);
+    if (!m_wxwindow)
+        return;
+    else
+        wxGenericDirDialog::DoSetSize( x, y, width, height, sizeFlags );

 }
 
 }
 

-void wxDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) )
+void wxDirDialog::SetPath(const wxString& dir)

 {
 {

-  wxTextEntryDialog dialog(this, _("Enter the name of the directory to create"),
-       _("Create New Directory"), m_input->GetValue(), wxOK|wxCANCEL);
-
-  while (dialog.ShowModal() == wxID_OK)
-  {
-    // Okay, let's make it
-    if (wxMkdir(dialog.GetValue())) {
-      // The new dir was created okay.
-      m_path = dialog.GetValue();
-      return;
+    if (!gtk_check_version(2,4,0))
+    {
+        if (wxDirExists(dir))
+        {
+            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
+                                                dir.fn_str());
+        }

     }
     }

-    wxString msg = _("Failed to create directory ")+dialog.GetValue()+
-      _("\n(Do you have the required permissions?)") ;
-    wxMessageDialog errmsg(this, msg, _("Error creating directory"), wxOK);
-    errmsg.ShowModal();
-    // Show the create dialog again, until user clicks cancel or enters
-    // a valid dir.
-  }
+    else
+        wxGenericDirDialog::SetPath( dir );

 }
 
 }
 

-/*
-void wxDirDialog::OnCheck( wxCommandEvent& WXUNUSED(event) )
+wxString wxDirDialog::GetPath() const

 {
 {

-  printf("Checkbox clicked: %s\n", ( m_check->GetValue() ? "on" : "off" ) );
+    if (!gtk_check_version(2,4,0))
+    {
+        wxGtkString str(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget)));
+        return wxString(str, *wxConvFileName);
+    }
+
+    return wxGenericDirDialog::GetPath();

 }
 }

-*/
+
+#endif // wxUSE_DIRDLG