/////////////////////////////////////////////////////////////////////////////
// Name: dirdlg.cpp
// Purpose: wxDirDialog
-// Author: Harm van der Heijden and Robert Roebling
+// Author: Harm van der Heijden, Robert Roebling & Julian Smart
// Modified by:
// Created: 12/12/98
-// Copyright: (c) Harm van der Heijden and Robert Roebling
-// Licence: wxWindows licence
+// RCS-ID: $Id$
+// Copyright: (c) Harm van der Heijden, Robert Roebling, Julian Smart
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "dirdlgg.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
#endif
#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/intl.h"
-#include "wx/imaglist.h"
-#include "wx/generic/dirdlgg.h"
+#if wxUSE_DIRDLG
-/* 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 */
-" ",
-" @@@@@ ",
-" @#+#+#@ ",
-" @#+#+#+#@@@@@@ ",
-" @$$$$$$$$$$$$@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @@@@@@@@@@@@@@.",
-" ..............",
-" ",
-" "};
+#ifndef WX_PRECOMP
+ #include "wx/textctrl.h"
+ #include "wx/button.h"
+ #include "wx/checkbox.h"
+ #include "wx/sizer.h"
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/msgdlg.h"
+#endif
+
+#include "wx/statline.h"
+#include "wx/dirctrl.h"
+#include "wx/generic/dirdlgg.h"
+#include "wx/artprov.h"
+#include "wx/bmpbuttn.h"
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
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;
+static const int ID_SHOW_HIDDEN = 1005;
+static const int ID_GO_HOME = 1006;
+
+// ---------------------------------------------------------------------------
+// macros
+// ---------------------------------------------------------------------------
+
+/* Macro for avoiding #ifdefs when value have to be different depending on size of
+ device we display on - take it from something like wxDesktopPolicy in the future
+ */
+
+#if defined(__SMARTPHONE__)
+ #define wxLARGESMALL(large,small) small
+#else
+ #define wxLARGESMALL(large,small) large
+#endif
//-----------------------------------------------------------------------------
-// wxDirItemData
+// wxGenericDirDialog
//-----------------------------------------------------------------------------
-wxDirItemData::wxDirItemData(wxString& path, wxString& name)
-{
- 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();
-}
+IMPLEMENT_DYNAMIC_CLASS(wxGenericDirDialog, wxDialog)
+
+BEGIN_EVENT_TABLE(wxGenericDirDialog, wxDialog)
+ EVT_CLOSE (wxGenericDirDialog::OnCloseWindow)
+ EVT_BUTTON (wxID_OK, wxGenericDirDialog::OnOK)
+ EVT_BUTTON (ID_NEW, wxGenericDirDialog::OnNew)
+ EVT_BUTTON (ID_GO_HOME, wxGenericDirDialog::OnGoHome)
+ EVT_TREE_KEY_DOWN (wxID_ANY, wxGenericDirDialog::OnTreeKeyDown)
+ EVT_TREE_SEL_CHANGED (wxID_ANY, wxGenericDirDialog::OnTreeSelected)
+ EVT_TEXT_ENTER (ID_TEXTCTRL, wxGenericDirDialog::OnOK)
+ EVT_CHECKBOX (ID_SHOW_HIDDEN, wxGenericDirDialog::OnShowHidden)
+END_EVENT_TABLE()
-wxDirItemData:: ~wxDirItemData()
+wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
+ const wxString& defaultPath, long style,
+ const wxPoint& pos, const wxSize& sz,
+ const wxString& name):
+ wxDialog(parent, ID_DIRCTRL, title, pos, sz, style, name)
{
- delete m_path;
- delete m_name;
-}
+ wxBusyCursor cursor;
-bool wxDirItemData::HasSubDirs()
-{
- wxString search = *m_path + "/*";
- wxString path = wxFindFirstFile( search, wxDIR );
- return (bool)(!path.IsNull());
-}
+ m_path = defaultPath;
+ if (m_path == wxT("~"))
+ wxGetHomeDir(&m_path);
+ if (m_path == wxT("."))
+ m_path = wxGetCwd();
-//-----------------------------------------------------------------------------
-// wxDirCtrl
-//-----------------------------------------------------------------------------
+ wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
-IMPLEMENT_DYNAMIC_CLASS(wxDirCtrl,wxTreeCtrl)
+ // smart phones does not support or do not waste space for wxButtons
+#if defined(__SMARTPHONE__)
-BEGIN_EVENT_TABLE(wxDirCtrl,wxTreeCtrl)
- EVT_TREE_ITEM_EXPANDING (-1, wxDirCtrl::OnExpandItem)
- EVT_TREE_ITEM_COLLAPSED (-1, wxDirCtrl::OnCollapseItem)
-END_EVENT_TABLE()
+ wxMenu *dirMenu = new wxMenu;
+ dirMenu->Append(ID_GO_HOME, _("Home"));
-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 )
-{
- 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") )
-}
-#undef ADD_SECTION
+ if (style & wxDD_NEW_DIR_BUTTON)
+ {
+ dirMenu->Append(ID_NEW, _("New directory"));
+ }
-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);
- }
-}
+ dirMenu->AppendCheckItem(ID_SHOW_HIDDEN, _("Show hidden directories"));
+ dirMenu->AppendSeparator();
+ dirMenu->Append(wxID_CANCEL, _("Cancel"));
-void wxDirCtrl::OnExpandItem( const wxTreeEvent &event )
-{
- 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);
+ SetRightMenu(wxID_ANY, _("Options"), dirMenu);
+
+#else
+
+ // 0) 'New' and 'Home' Buttons
+ wxSizer* buttonsizer = new wxBoxSizer( wxHORIZONTAL );
+
+ // VS: 'Home directory' concept is unknown to MS-DOS
+#if !defined(__DOS__)
+ wxBitmapButton* homeButton =
+ new wxBitmapButton(this, ID_GO_HOME,
+ wxArtProvider::GetBitmap(wxART_GO_HOME, wxART_BUTTON));
+ buttonsizer->Add( homeButton, 0, wxLEFT|wxRIGHT, 10 );
+#endif
+
+ // I'm not convinced we need a New button, and we tend to get annoying
+ // accidental-editing with label editing enabled.
+ if (style & wxDD_NEW_DIR_BUTTON)
+ {
+ wxBitmapButton* newButton =
+ new wxBitmapButton(this, ID_NEW,
+ wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_BUTTON));
+ buttonsizer->Add( newButton, 0, wxRIGHT, 10 );
+#if wxUSE_TOOLTIPS
+ newButton->SetToolTip(_("Create new directory"));
+#endif
}
- }
- CreateItems(event.GetItem());
- wxEndBusyCursor();
-};
+#if wxUSE_TOOLTIPS
+ homeButton->SetToolTip(_("Go to home directory"));
+#endif
-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);
- }
-};
+ topsizer->Add( buttonsizer, 0, wxTOP | wxALIGN_RIGHT, 10 );
-//-----------------------------------------------------------------------------
-// wxDirDialog
-//-----------------------------------------------------------------------------
+#endif // __SMARTPHONE__/!__SMARTPHONE__
+ // 1) dir ctrl
+ m_dirCtrl = NULL; // this is necessary, event handler called from
+ // wxGenericDirCtrl would crash otherwise!
+ long dirStyle = wxDIRCTRL_DIR_ONLY | wxDEFAULT_CONTROL_BORDER;
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_CLASS(wxDirDialog, wxDialog)
-#else
-IMPLEMENT_DYNAMIC_CLASS( wxDirDialog, wxDialog )
+#ifdef __WXMSW__
+ if (style & wxDD_NEW_DIR_BUTTON)
+ {
+ // Only under Windows do we need the wxTR_EDIT_LABEL tree control style
+ // before we can call EditLabel (required for "New directory")
+ dirStyle |= wxDIRCTRL_EDIT_LABELS;
+ }
#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)
-END_EVENT_TABLE()
+ m_dirCtrl = new wxGenericDirCtrl(this, ID_DIRCTRL,
+ m_path, wxDefaultPosition,
+ wxSize(300, 200),
+ dirStyle);
+
+ topsizer->Add( m_dirCtrl, 1, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, wxLARGESMALL(10,0) );
+
+#ifndef __SMARTPHONE__
+ // Make the an option depending on a flag?
+ wxCheckBox* check = new wxCheckBox( this, ID_SHOW_HIDDEN, _("Show hidden directories") );
+ topsizer->Add( check, 0, wxLEFT|wxRIGHT|wxTOP | wxALIGN_RIGHT, 10 );
+#endif // !__SMARTPHONE__
+
+ // 2) text ctrl
+ m_input = new wxTextCtrl( this, ID_TEXTCTRL, m_path, wxDefaultPosition );
+ topsizer->Add( m_input, 0, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, wxLARGESMALL(10,0) );
+
+#ifndef __SMARTPHONE__
+
+#if wxUSE_STATLINE
+ // 3) Static line
+ topsizer->Add( new wxStaticLine( this, wxID_ANY ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
+#endif
-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)
+ // 4) Buttons
+ topsizer->Add( CreateButtonSizer( wxOK|wxCANCEL ), 0, wxEXPAND | wxALL, 10 );
+
+#endif // !__SMARTPHONE__
+
+ m_input->SetFocus();
+
+ SetAutoLayout( true );
+ SetSizer( topsizer );
+
+#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)
+ topsizer->SetSizeHints( this );
+ topsizer->Fit( this );
+
+ Centre( wxBOTH );
+#endif
+}
+
+void wxGenericDirDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
{
- 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();
+ EndModal(wxID_CANCEL);
}
-void wxDirDialog::OnSize(wxSizeEvent& WXUNUSED(event))
+void wxGenericDirDialog::OnOK(wxCommandEvent& WXUNUSED(event))
{
- doSize();
+ m_path = m_input->GetValue();
+ // Does the path exist? (User may have typed anything in m_input)
+ if (wxDirExists(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;
+ msg.Printf(_("The directory '%s' does not exist\nCreate it now?"),
+ m_path.c_str());
+ wxMessageDialog dialog(this, msg, _("Directory does not exist"),
+ wxYES_NO | wxICON_WARNING);
+
+ if ( dialog.ShowModal() == wxID_YES ) {
+ // Okay, let's make it
+ wxLogNull log;
+ if (wxMkdir(m_path)) {
+ // The new dir was created okay.
+ EndModal(wxID_OK);
+ return;
+ }
+ else {
+ // Trouble...
+ msg.Printf(_("Failed to create directory '%s'\n(Do you have the required permissions?)"),
+ m_path.c_str());
+ wxMessageDialog errmsg(this, msg, _("Error creating directory"), wxOK | wxICON_ERROR);
+ errmsg.ShowModal();
+ // We still don't have a valid dir. Back to the main dialog.
+ }
+ }
+ // User has answered NO to create dir.
}
-void wxDirDialog::doSize()
+void wxGenericDirDialog::SetPath(const wxString& path)
{
- /* 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();
+ m_dirCtrl->SetPath(path);
+ m_path = path;
}
-int wxDirDialog::ShowModal()
+wxString wxGenericDirDialog::GetPath(void) const
{
- m_input->SetValue( m_path );
- return wxDialog::ShowModal();
+ return m_path;
}
-void wxDirDialog::OnTreeSelected( wxTreeEvent &event )
+int wxGenericDirDialog::ShowModal()
{
- wxDirItemData *data =
- (wxDirItemData*)m_dir->GetItemData(event.GetItem());
- if (data)
- m_input->SetValue( *(data->m_path) );
-};
+ m_input->SetValue( m_path );
+ return wxDialog::ShowModal();
+}
-void wxDirDialog::OnTreeKeyDown( wxKeyEvent &WXUNUSED(event) )
+void wxGenericDirDialog::OnTreeSelected( wxTreeEvent &event )
{
- wxDirItemData *data =
- (wxDirItemData*)m_dir->GetItemData(m_dir->GetSelection());
- if (data)
- m_input->SetValue( *(data->m_path) );
-};
+ if (!m_dirCtrl)
+ return;
+
+ wxTreeItemId item = event.GetItem();
+
+ wxDirItemData *data = NULL;
+
+ if(item.IsOk())
+ data = (wxDirItemData*)m_dirCtrl->GetTreeCtrl()->GetItemData(item);
-void wxDirDialog::OnOK( wxCommandEvent& WXUNUSED(event) )
+ if (data)
+ m_input->SetValue( data->m_path );
+}
+
+void wxGenericDirDialog::OnTreeKeyDown( wxTreeEvent &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 (!m_dirCtrl)
+ return;
+
+ wxDirItemData *data = (wxDirItemData*)m_dirCtrl->GetTreeCtrl()->GetItemData(m_dirCtrl->GetTreeCtrl()->GetSelection());
+ if (data)
+ m_input->SetValue( data->m_path );
}
-void wxDirDialog::OnCancel( wxCommandEvent& WXUNUSED(event) )
+void wxGenericDirDialog::OnShowHidden( wxCommandEvent& event )
{
- EndModal(wxID_CANCEL);
+ if (!m_dirCtrl)
+ return;
+
+ m_dirCtrl->ShowHidden( event.GetInt() != 0 );
}
-void wxDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) )
+void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) )
{
- 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;
+ wxTreeItemId id = m_dirCtrl->GetTreeCtrl()->GetSelection();
+ if ((id == m_dirCtrl->GetTreeCtrl()->GetRootItem()) ||
+ (m_dirCtrl->GetTreeCtrl()->GetItemParent(id) == m_dirCtrl->GetTreeCtrl()->GetRootItem()))
+ {
+ wxMessageDialog msg(this, _("You cannot add a new directory to this section."),
+ _("Create directory"), wxOK | wxICON_INFORMATION );
+ msg.ShowModal();
+ return;
}
- 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.
- }
+
+ wxTreeItemId parent = id ; // m_dirCtrl->GetTreeCtrl()->GetItemParent( id );
+ wxDirItemData *data = (wxDirItemData*)m_dirCtrl->GetTreeCtrl()->GetItemData( parent );
+ wxASSERT( data );
+
+ wxString new_name( _("NewName") );
+ wxString path( data->m_path );
+ if (!wxEndsWithPathSeparator(path))
+ path += wxFILE_SEP_PATH;
+ path += new_name;
+ if (wxDirExists(path))
+ {
+ // try NewName0, NewName1 etc.
+ int i = 0;
+ do {
+ new_name = _("NewName");
+ wxString num;
+ num.Printf( wxT("%d"), i );
+ new_name += num;
+
+ path = data->m_path;
+ if (!wxEndsWithPathSeparator(path))
+ path += wxFILE_SEP_PATH;
+ path += new_name;
+ i++;
+ } while (wxDirExists(path));
+ }
+
+ wxLogNull log;
+ if (!wxMkdir(path))
+ {
+ wxMessageDialog dialog(this, _("Operation not permitted."), _("Error"), wxOK | wxICON_ERROR );
+ dialog.ShowModal();
+ return;
+ }
+
+ wxDirItemData *new_data = new wxDirItemData( path, new_name, true );
+
+ // TODO: THIS CODE DOESN'T WORK YET. We need to avoid duplication of the first child
+ // of the parent.
+ wxTreeItemId new_id = m_dirCtrl->GetTreeCtrl()->AppendItem( parent, new_name, 0, 0, new_data );
+ m_dirCtrl->GetTreeCtrl()->EnsureVisible( new_id );
+ m_dirCtrl->GetTreeCtrl()->EditLabel( new_id );
}
-/*
-void wxDirDialog::OnCheck( wxCommandEvent& WXUNUSED(event) )
+void wxGenericDirDialog::OnGoHome(wxCommandEvent& WXUNUSED(event))
{
- printf("Checkbox clicked: %s\n", ( m_check->GetValue() ? "on" : "off" ) );
+ SetPath(wxGetUserHome());
}
-*/
+
+#endif // wxUSE_DIRDLG
projects / wxWidgets.git / blobdiff