diff options
| -rw-r--r-- | konqueror/listview/konq_detailedlistview.rc | 2 | ||||
| -rw-r--r-- | konqueror/listview/konq_infolistview.rc | 2 | ||||
| -rw-r--r-- | konqueror/listview/konq_listview.cpp | 126 | ||||
| -rw-r--r-- | konqueror/listview/konq_textview.rc | 2 | ||||
| -rw-r--r-- | konqueror/listview/konq_treeview.rc | 2 |
5 files changed, 17 insertions, 117 deletions
diff --git a/konqueror/listview/konq_detailedlistview.rc b/konqueror/listview/konq_detailedlistview.rc index b3238e2ad..0adbb5020 100644 --- a/konqueror/listview/konq_detailedlistview.rc +++ b/konqueror/listview/konq_detailedlistview.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="KonqDetailedListView" version="13"> +<kpartgui name="KonqDetailedListView" version="14"> <MenuBar> <Menu name="edit"><text>&Edit</text> <Menu name="selection"><text>Selection</text> diff --git a/konqueror/listview/konq_infolistview.rc b/konqueror/listview/konq_infolistview.rc index 9e28d2b44..0e21d7023 100644 --- a/konqueror/listview/konq_infolistview.rc +++ b/konqueror/listview/konq_infolistview.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="KonqInfoListView" version="14"> +<kpartgui name="KonqInfoListView" version="15"> <MenuBar> <Menu name="edit"><text>&Edit</text> <Menu name="selection"><text>Selection</text> diff --git a/konqueror/listview/konq_listview.cpp b/konqueror/listview/konq_listview.cpp index a2a2bef0a..b7956bfcb 100644 --- a/konqueror/listview/konq_listview.cpp +++ b/konqueror/listview/konq_listview.cpp @@ -273,6 +273,9 @@ KonqListView::KonqListView( TQWidget *parentWidget, TQObject *parent, const char m_sortColumnIndexPrimary = 0; m_sortColumnIndexAlternate = 1; + TDEIO::HiddenFileMatcher* matcher = TDEIO::HiddenFileMatcher::getInstance(); + matcher->setCriteria( m_pProps->hiddenFileSpec() ); + setupActions(); m_pListView->confColumns.resize( 11 ); @@ -479,106 +482,18 @@ void KonqListView::newIconSize( int size ) void KonqListView::slotChangeHiddenFileMatcher() { - - /* Temporarily + /* + Since the user might be providing *updated* hidden file match properties, + we first need to make sure that we are showing (not hiding) "hidden" files + as defined by the *current*. Otherwise there can be a lot of confusion! */ + m_paShowDot->setChecked( TRUE ); + slotShowDot(); TDEIO::HiddenFileMatcher* matcher = TDEIO::HiddenFileMatcher::getInstance(); - - // Someday we will do this and it will actually accomplish what we want: - - TQString updated_criteria = matcher->updateCriteria( "Define hidden for listview" ); - if ( matcher->setCriteria( updated_criteria ) ) { - m_pProps->setHiddenFileSpec ( updated_criteria ); - } - else { - kdWarning() - << "Failed to update critera - bad input? <" - << updated_criteria << ">" - << endl; - } - - // Until the UI dialog is ready, we'll just do a demonstration - - TQString stored_criteria = m_pProps->hiddenFileSpec(); - TQString stored_criteria_saved = stored_criteria; - - TQString active_criteria = matcher->getCriteria(); - - kdWarning() - << "Hidden file match criteria before test updates:" << endl - << " Config: <" << stored_criteria << "> (assuming that this is a good match criteria)" << endl - << " Active: <" << active_criteria << "> (should be same because of KonqListview initialization)" << endl - ; - - // What happens with good update? - - updated_criteria = "R^good/criteria$"; // simulation of output of TBD UI dialog: - // TQString updated_criteria = Get_HiddenFileCriteri_Dialog(stored_criteria); - if ( matcher->setCriteria( updated_criteria ) ) { - m_pProps->setHiddenFileSpec ( updated_criteria ); - } - else { - kdWarning() - << "Failed to update critera - bad input? <" - << updated_criteria << ">" - << endl; - } - - active_criteria = matcher->getCriteria(); - stored_criteria = m_pProps->hiddenFileSpec(); - kdWarning() - << "Hidden file match criteria after test update 1:" << endl - << " Update: <" << updated_criteria << ">" << endl - << " Active: <" << active_criteria << ">" << endl - << " Config: <" << stored_criteria << ">" << endl - ; - - // What happens with bad update? - - updated_criteria = "^bad/need/leading/W_w_R_r"; - if ( matcher->setCriteria( updated_criteria ) ) { - m_pProps->setHiddenFileSpec ( updated_criteria ); - } - else { - kdWarning() - << "Failed to update critera - bad input? <" - << updated_criteria << ">" - << endl; - } - - active_criteria = matcher->getCriteria(); - stored_criteria = m_pProps->hiddenFileSpec(); - kdWarning() - << "Hidden file match criteria after test update 2:" << endl - << " Update: <" << updated_criteria << ">" << endl - << " Active: <" << active_criteria << ">" << endl - << " Config: <" << stored_criteria << ">" << endl - ; - - // Restore the original (and hopefully valid) match criteria - - updated_criteria = stored_criteria_saved; - if ( matcher->setCriteria( updated_criteria ) ) { - m_pProps->setHiddenFileSpec ( updated_criteria ); - } - else { - kdWarning() - << "Failed to update critera - bad input? <" - << updated_criteria << ">" - << endl; + if ( matcher->getMatchPropertiesFromUser() ) { + m_pProps->setHiddenFileSpec ( matcher->getCriteria() ); } - - active_criteria = matcher->getCriteria(); - stored_criteria = m_pProps->hiddenFileSpec(); - kdWarning() - << "Hidden file match criteria after restoring original criteria:" << endl - << " Update: <" << updated_criteria << ">" << endl - << " Active: <" << active_criteria << ">" << endl - << " Config: <" << stored_criteria << ">" << endl - ; - - return; } void KonqListView::slotShowDot() @@ -1033,24 +948,9 @@ void KonqListView::setupActions() m_paRenameMovePrev->setToolTip( i18n("Complete rename operation and move the previous item")); m_paRenameMovePrev->setEnabled(false); - m_paChangeHiddenFileMatcher = new TDEAction( i18n( "Change &Hidden File Matcher" ), CTRL+SHIFT+Key_H, this, - TQT_SLOT( slotChangeHiddenFileMatcher() ), actionCollection(), "change_hidden_file_matcher" ); - /* Temporarily - */ - // Initialize hidden file matcher criteria - TDEIO::HiddenFileMatcher* matcher = TDEIO::HiddenFileMatcher::getInstance(); - // This is probably the 1st call that creates the central instance - matcher->setCriteria( m_pProps->hiddenFileSpec() ); - /* Do we want or need to display current match criteria in menu??? - Sample from konq_iconview.cpp::KonqKfmIconView::KonqKfmIconView - //enable menu item representing the saved sorting criterion - TQString sortcrit = KonqIconViewFactory::defaultViewProps()->sortCriterion(); - TDERadioAction *sort_action = tqt_dynamic_cast<TDERadioAction *>(actionCollection()->action(sortcrit.latin1())); - if(sort_action!=NULL) sort_action->activate(); - */ - m_paShowDot = new TDEToggleAction( i18n( "Show &Hidden Files" ), CTRL+Key_H, this, TQT_SLOT( slotShowDot() ), actionCollection(), "show_dot" ); -// m_paShowDot->setCheckedState(i18n("Hide &Hidden Files")); + m_paChangeHiddenFileMatcher = new TDEAction( i18n( "Change &Hidden File Matcher" ), ALT+CTRL+Key_H, this, + TQT_SLOT( slotChangeHiddenFileMatcher() ), actionCollection(), "change_hidden_file_matcher" ); m_paCaseInsensitive = new TDEToggleAction(i18n("Case Insensitive Sort"), 0, this, TQT_SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" ); diff --git a/konqueror/listview/konq_textview.rc b/konqueror/listview/konq_textview.rc index 37cbaa67c..780b1ce4b 100644 --- a/konqueror/listview/konq_textview.rc +++ b/konqueror/listview/konq_textview.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="KonqTextView" version="7"> +<kpartgui name="KonqTextView" version="8"> <MenuBar> <Menu name="edit"><text>&Edit</text> <Menu name="selection"><text>Selection</text> diff --git a/konqueror/listview/konq_treeview.rc b/konqueror/listview/konq_treeview.rc index 9a603ee02..40485fd06 100644 --- a/konqueror/listview/konq_treeview.rc +++ b/konqueror/listview/konq_treeview.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="KonqTreeView" version="12"> +<kpartgui name="KonqTreeView" version="13"> <MenuBar> <Menu name="edit"><text>&Edit</text> <Menu name="selection"><text>Selection</text> |