Remove code pertaining to pop-up sort options dialog (will be implemented as separate PR)

Modify names and labels per discussions with MicheleC.

Signed-off-by: Vincent Reher <tde@4reher.org>

12 files changed, 31 insertions, 553 deletions

diff --git a/konqueror/listview/konq_detailedlistview.rc b/konqueror/listview/konq_detailedlistview.rc
index b889124ea..d558a0da7 100644
--- a/konqueror/listview/konq_detailedlistview.rc
+++ b/konqueror/listview/konq_detailedlistview.rc
@@ -25,21 +25,15 @@
   <Separator/>
   <Action name="show_dot"/>
   <Menu name="sort"><text>&amp;Sort</text>
-    <!--
-    <Action name="order_0"/>
-    <Action name="order_2"/>
-    <Action name="order_1"/>
-    -->
+    <!--TBD <TearOffHandle />-->
     <Action name="order_unicode_unmodified"/>
-    <Action name="order_unicode_alphas_adjacent"/>
+    <Action name="order_unicode_case_insensitive"/>
+    <!--<Action name="sort_caseinsensitive"/>-->
     <Action name="order_locale_defined"/>
     <Separator/>
     <Action name="group_directories_first"/>
     <Action name="group_hidden_first"/>
     <Separator/>
-    <Action name="sort_options_dialog"/>
-<!--<Action name="sort_caseinsensitive"/>-->
-    <Separator/>
     <Action name="alternate_sort_order"/>
     <Action name="reverse_sort_order"/>
   </Menu>
diff --git a/konqueror/listview/konq_infolistview.rc b/konqueror/listview/konq_infolistview.rc
index b48953311..ec79c48d9 100644
--- a/konqueror/listview/konq_infolistview.rc
+++ b/konqueror/listview/konq_infolistview.rc
@@ -25,16 +25,15 @@
   <Separator/>
   <Action name="show_dot"/>
   <Menu name="sort"><text>&amp;Sort</text>
+    <!--TBD <TearOffHandle />-->
     <Action name="order_unicode_unmodified"/>
-    <Action name="order_unicode_alphas_adjacent"/>
+    <Action name="order_unicode_case_insensitive"/>
+    <!--<Action name="sort_caseinsensitive"/>-->
     <Action name="order_locale_defined"/>
     <Separator/>
     <Action name="group_directories_first"/>
     <Action name="group_hidden_first"/>
     <Separator/>
-    <Action name="sort_options_dialog"/>
-<!--<Action name="sort_caseinsensitive"/>-->
-    <Separator/>
     <Action name="alternate_sort_order"/>
     <Action name="reverse_sort_order"/>
   </Menu>
diff --git a/konqueror/listview/konq_listview.cpp b/konqueror/listview/konq_listview.cpp
index 41d21b3cd..266bcae03 100644
--- a/konqueror/listview/konq_listview.cpp
+++ b/konqueror/listview/konq_listview.cpp
@@ -952,12 +952,12 @@ void KonqListView::setupActions()
   );
   m_paOrder_UnicodeUnmodified->setChecked(initialOrder == UNICODE_UNMODIFIED);
 
-  m_paOrder_UnicodeAlphasAdjacent = new TDEToggleAction(
-    i18n(LABEL_UNICODE_ALPHAS_ADJACENT), 0, this,
-    TQT_SLOT(slotOrder_UnicodeAlphasAdjacent()),
-    actionCollection(), "order_unicode_alphas_adjacent"
+  m_paOrder_UnicodeCaseInsensitive = new TDEToggleAction(
+    i18n(LABEL_UNICODE_CASEINSENSITIVE), 0, this,
+    TQT_SLOT(slotOrder_UnicodeCaseInsensitive()),
+    actionCollection(), "order_unicode_case_insensitive"
   );
-  m_paOrder_UnicodeAlphasAdjacent->setChecked(initialOrder == UNICODE_ALPHAS_ADJACENT);
+  m_paOrder_UnicodeCaseInsensitive->setChecked(initialOrder == UNICODE_CASEINSENSITIVE);
 
   m_paOrder_Locale = new TDEToggleAction(
     i18n(LABEL_LOCALE_UNMODIFIED), 0, this,
@@ -968,7 +968,7 @@ void KonqListView::setupActions()
 
   // Convert above 3 checkbox menu items into single 3-way radio button menu item
   m_paOrder_UnicodeUnmodified->setExclusiveGroup( "sortOrder" );
-  m_paOrder_UnicodeAlphasAdjacent->setExclusiveGroup( "sortOrder" );
+  m_paOrder_UnicodeCaseInsensitive->setExclusiveGroup( "sortOrder" );
   m_paOrder_Locale->setExclusiveGroup( "sortOrder" );
 
   m_paDisplayDirectoriesFirst = new TDEToggleAction( i18n("Group &Directories First"), 0, this,
@@ -979,13 +979,6 @@ void KonqListView::setupActions()
     TQT_SLOT(slotToggleDisplayHiddenFirst()), actionCollection(), "group_hidden_first");
   m_paDisplayHiddenFirst->setChecked(m_pProps->isHiddenFirst());
 
-  /*
-     Build popup dialog interface to properties
-     SortOrder, SortDirsFirst & SortHiddenFirst
-  */
-  m_paSortOptionDialog = new TDEAction( i18n( "Sort Options Dialog" ), CTRL+SHIFT+Key_S, this,
-     TQT_SLOT( slotSortOptionDialog() ), actionCollection(), "sort_options_dialog");
-
   newIconSize( TDEIcon::SizeSmall /* default size */ );
 }
 
@@ -1007,9 +1000,9 @@ void KonqListView::slotOrder_UnicodeUnmodified()
   m_pListView->sort();
 }
 
-void KonqListView::slotOrder_UnicodeAlphasAdjacent()
+void KonqListView::slotOrder_UnicodeCaseInsensitive()
 {
-  TextSortOrder sortOrder = UNICODE_ALPHAS_ADJACENT;
+  TextSortOrder sortOrder = UNICODE_CASEINSENSITIVE;
   kdWarning() << "Setting name order = " << sortOrder << endl;
 //kdDebug(1202) << "Setting name order = " << sortOrder << endl;
   m_pProps->setSortOrder( sortOrder );
@@ -1027,71 +1020,5 @@ void KonqListView::slotOrder_Locale()
   m_pListView->sort();
 }
 
-#include <konq_sort_options_dialog.h>
-
-void KonqListView::slotSortOptionDialog()
-{
-  TextSortOrder sortOrder = m_pProps->getSortOrder();
-  bool dirsFirst          = m_pProps->isDirsFirst();
-  bool hiddenFirst        = m_pProps->isHiddenFirst();
-  bool updatelist         = FALSE;
-
-  Sort_Options_Dialog dialog( sortOrder, dirsFirst, hiddenFirst);
-  dialog.exec();
-
-  if ( ! dialog.optionsModified ) {
-    kdDebug(1202) << "Sort options were not changed " << endl;
-    return;
-  }
-
-  if ( dialog.sortOrder != sortOrder ) {
-    kdDebug(1202) << "SortOrder changed " << sortOrder << "=>" << dialog.sortOrder << endl;
-    m_pProps->setSortOrder(dialog.sortOrder);
-    m_pListView->m_sortOrder = dialog.sortOrder ;
-    // Update corresponding View->Sort submenu interface
-    switch( dialog.sortOrder ) {
-      case UNICODE_UNMODIFIED:
-        m_paOrder_UnicodeUnmodified->setChecked(TRUE);
-        break;
-      case UNICODE_ALPHAS_ADJACENT:
-        m_paOrder_UnicodeAlphasAdjacent->setChecked(TRUE);
-        break;
-      case LOCALE_DEFAULT:
-        m_paOrder_Locale->setChecked(TRUE);
-        break;
-      default:
-        m_paOrder_UnicodeAlphasAdjacent->setChecked(TRUE);
-        break;
-    };
-  }
-
-  if ( dialog.directoriesFirst != dirsFirst ) {
-    kdDebug(1202) << "DirsFirst changed " << dirsFirst << " => " << dialog.directoriesFirst << endl;
-    m_pProps->setDirsFirst( dialog.directoriesFirst );
-    updatelist  = TRUE;
-    // Update corresponding View->Sort submenu interface
-    m_paDisplayDirectoriesFirst->setChecked( dialog.directoriesFirst );
-  }
-
-  if ( dialog.hiddenFirst != hiddenFirst ) {
-    kdDebug(1202) << "HiddenFirst changed " << hiddenFirst << " => " << dialog.hiddenFirst << endl;
-    m_pProps->setHiddenFirst( dialog.hiddenFirst );
-    updatelist  = TRUE;
-    // Update corresponding View->Sort submenu interface
-    m_paDisplayHiddenFirst->setChecked( dialog.hiddenFirst );
-  }
-
-  if (updatelist) {
-  //kdDebug(1202)
-    kdWarning()
-      << "Sort options affecting grouping were changed: will update info for each file."
-      << endl;
-    m_pListView->updateListContents();
-  }
-  kdWarning()   << "Sort options were changed: will sort and redisplay list" << endl;
-//kdDebug(1202) << "Sort options were changed: will sort and redisplay list" << endl;
-  m_pListView->sort();
-}
-
 #include "konq_listview.moc"
 
diff --git a/konqueror/listview/konq_listview.h b/konqueror/listview/konq_listview.h
index 908c86639..dc8903047 100644
--- a/konqueror/listview/konq_listview.h
+++ b/konqueror/listview/konq_listview.h
@@ -133,13 +133,11 @@ protected slots:
   void slotHeaderClicked(int sec);
 
   void slotOrder_UnicodeUnmodified();
-  void slotOrder_UnicodeAlphasAdjacent();
+  void slotOrder_UnicodeCaseInsensitive();
   void slotOrder_Locale();
   void slotToggleDisplayDirectoriesFirst();
   void slotToggleDisplayHiddenFirst();
 
-  void slotSortOptionDialog();
-
   void slotSortAlternate();
   void slotSortReverse();
 
@@ -208,7 +206,7 @@ private:
   TDEToggleAction *m_paShowURL;
 
   TDEToggleAction *m_paOrder_UnicodeUnmodified;
-  TDEToggleAction *m_paOrder_UnicodeAlphasAdjacent;
+  TDEToggleAction *m_paOrder_UnicodeCaseInsensitive;
   TDEToggleAction *m_paOrder_Locale;
 
   TDEToggleAction *m_paDisplayDirectoriesFirst;
diff --git a/konqueror/listview/konq_textview.rc b/konqueror/listview/konq_textview.rc
index 4d229819a..103f2b82e 100644
--- a/konqueror/listview/konq_textview.rc
+++ b/konqueror/listview/konq_textview.rc
@@ -14,16 +14,15 @@
  <Menu name="view"><text>&amp;View</text>
   <Action name="show_dot" />
   <Menu name="sort"><text>&amp;Sort</text>
+    <!--TBD <TearOffHandle />-->
     <Action name="order_unicode_unmodified"/>
-    <Action name="order_unicode_alphas_adjacent"/>
+    <Action name="order_unicode_case_insensitive"/>
+    <!--<Action name="sort_caseinsensitive"/>-->
     <Action name="order_locale_defined"/>
     <Separator/>
     <Action name="group_directories_first"/>
     <Action name="group_hidden_first"/>
     <Separator/>
-    <Action name="sort_options_dialog"/>
-<!--<Action name="sort_caseinsensitive"/>-->
-    <Separator/>
     <Action name="alternate_sort_order"/>
     <Action name="reverse_sort_order"/>
   </Menu>
diff --git a/konqueror/listview/konq_treeview.rc b/konqueror/listview/konq_treeview.rc
index d097bad21..5691c6011 100644
--- a/konqueror/listview/konq_treeview.rc
+++ b/konqueror/listview/konq_treeview.rc
@@ -25,16 +25,15 @@
   <Separator/>
   <Action name="show_dot"/>
   <Menu name="sort"><text>&amp;Sort</text>
+    <!--TBD <TearOffHandle />-->
     <Action name="order_unicode_unmodified"/>
-    <Action name="order_unicode_alphas_adjacent"/>
+    <Action name="order_unicode_case_insensitive"/>
+    <!--<Action name="sort_caseinsensitive"/>-->
     <Action name="order_locale_defined"/>
     <Separator/>
     <Action name="group_directories_first"/>
     <Action name="group_hidden_first"/>
     <Separator/>
-    <Action name="sort_options_dialog"/>
-<!--<Action name="sort_caseinsensitive"/>-->
-    <Separator/>
     <Action name="alternate_sort_order"/>
     <Action name="reverse_sort_order"/>
   </Menu>
diff --git a/libkonq/CMakeLists.txt b/libkonq/CMakeLists.txt
index 3ec025e43..c1780780d 100644
--- a/libkonq/CMakeLists.txt
+++ b/libkonq/CMakeLists.txt
@@ -44,7 +44,6 @@ install( FILES
     kivdirectoryoverlay.h kivfreespaceoverlay.h konq_faviconmgr.h
     konq_xmlguiclient.h konqbookmarkmanager.h konq_filetip.h
     konq_sort_constants.h konq_string_compare.h
-    konq_sort_options_dialog.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 
@@ -73,7 +72,6 @@ tde_add_library( konq SHARED AUTOMOC
     konq_undo.skel konq_historymgr.cpp konq_historycomm.cpp konq_historycomm.skel
     konq_pixmapprovider.cpp kivdirectoryoverlay.cpp kivfreespaceoverlay.cpp
     konq_faviconmgr.cpp konq_faviconmgr.skel konq_filetip.cpp
-    konq_sort_options_dialog.cpp
   VERSION 4.2.0
   LINK tdeparts-shared
   DESTINATION ${LIB_INSTALL_DIR}
diff --git a/libkonq/Makefile.am b/libkonq/Makefile.am
index c969e5019..3c3897155 100644
--- a/libkonq/Makefile.am
+++ b/libkonq/Makefile.am
@@ -33,8 +33,7 @@ libkonq_la_SOURCES = konq_popupmenu.cpp knewmenu.cpp \
    konq_pixmapprovider.cpp \
    kivdirectoryoverlay.cpp \
    kivfreespaceoverlay.cpp \
-   konq_faviconmgr.cpp konq_faviconmgr.skel konq_filetip.cpp \
-   konq_sort_helpers.cpp konq_sort_options_dialog.cpp
+   konq_faviconmgr.cpp konq_faviconmgr.skel konq_filetip.cpp
 
 directory_DATA = directory_bookmarkbar.desktop 
 directorydir   = $(kde_datadir)/kbookmark
@@ -54,8 +53,7 @@ include_HEADERS = konq_popupmenu.h knewmenu.h \
     kivdirectoryoverlay.h \
     kivfreespaceoverlay.h \
     konq_faviconmgr.h konq_xmlguiclient.h konqbookmarkmanager.h konq_filetip.h \
-    konq_sort_constants.h konq_string_compare.h \
-    konq_sort_options_dialog.h
+    konq_sort_constants.h konq_string_compare.h
 
 
 if include_ARTS
diff --git a/libkonq/konq_sort_constants.h b/libkonq/konq_sort_constants.h
index e9f2e157e..c58d3cb30 100644
--- a/libkonq/konq_sort_constants.h
+++ b/libkonq/konq_sort_constants.h
@@ -7,7 +7,7 @@ typedef unsigned short TextSortOrder;
 enum {
   UNICODE_UNMODIFIED      = 0,
   LOCALE_UNMODIFIED       = 1,
-  UNICODE_ALPHAS_ADJACENT = 2,
+  UNICODE_CASEINSENSITIVE = 2,
   LOCALE_MODIFIED         = 3
 } TextSortOrders;
 
@@ -16,16 +16,16 @@ enum {
 
 // We define these UI text items once to used in different places
 
-#define LABEL_UNICODE_UNMODIFIED      "&Character Code - Strict (AB...ab)"
-#define LABEL_UNICODE_ALPHAS_ADJACENT "Character Code - &Modified (aAbB)"
-#define LABEL_LOCALE_UNMODIFIED       "&Natural Order (locale-defined)"
-#define LABEL_LOCALE_MODIFIED         "Natural Order - Improved"
+#define LABEL_UNICODE_UNMODIFIED      "&Unicode based"
+#define LABEL_UNICODE_CASEINSENSITIVE "Unicode based, &case insensitive"
+#define LABEL_LOCALE_UNMODIFIED       "&Locale Order"
+#define LABEL_LOCALE_MODIFIED         "Locale Order - &Improved"
 
 #define LABEL_DIRECTORIES_FIRST       "&Directories displayed before non-directories"
 #define LABEL_HIDDEN_FIRST            "&Hidden displayed before non-hidden"
 
 #define TOOLTIP_UNICODE_UNMODIFIED      "Strict numeric Unicode codepoint order"
-#define TOOLTIP_UNICODE_ALPHAS_ADJACENT "Like above but with lower/upper case ASCII letters adjacent"
+#define TOOLTIP_UNICODE_CASEINSENSITIVE "Like above but with lower/upper case ASCII letters adjacent"
 #define TOOLTIP_LOCALE_UNMODIFIED       "Locale-defined order, usually \"friendly\""
 #define TOOLTIP_LOCALE_MODIFIED         "Locale-defined order with enhancements"
 
diff --git a/libkonq/konq_sort_options_dialog.cpp b/libkonq/konq_sort_options_dialog.cpp
deleted file mode 100644
index 3ff83a7ce..000000000
--- a/libkonq/konq_sort_options_dialog.cpp
+++ /dev/null
@@ -1,367 +0,0 @@
-#include "konq_sort_options_dialog.h"
-#include "konq_sort_constants.h" // Important
-	
-#ifdef MAKE_TEST_PGM
-  #include <iostream>
-  using namespace std;
-  #include <tqapplication.h>
-#endif
-
-#include <tqdialog.h>
-#include <tqbuttongroup.h>
-#include <tqradiobutton.h>
-#include <tqcheckbox.h>
-#include <tqpushbutton.h>
-#include <tqlayout.h>
-#include <tqtooltip.h>
-#include <tqwhatsthis.h>
-
-//=============================================================================
-//  Code originally derived from tqdesigner-generated .uic/sortoptionsdialog.cpp
-//=============================================================================
-
-Sort_Options_Dialog::~Sort_Options_Dialog(){ }
-void Sort_Options_Dialog::Sort_Options_Dialog_destroyed(TQObject* a){}
-
-Sort_Options_Dialog::Sort_Options_Dialog(
-  TextSortOrder initial_sortOrder,
-  bool          initial_directoriesFirst,
-  bool          initial_hiddenFirst
-)
-{
-  optionsModified = 0;
-
-  setName( "Sort_Options_Dialog" );
-  setCaption( tr("File Manager Sort Options") );
-  setModal( FALSE );
-
-  // Create radio buttons pertinent to sort order
-
-  bg_Sort_Order = new TQButtonGroup( this );
-  bg_Sort_Order->setName( "bg_Sort_Order" );
-  bg_Sort_Order->setGeometry( TQRect( 20, 10, 370, 110 ) );
-
-  bg_Sort_Order->setSizePolicy( TQSizePolicy(
-     (TQSizePolicy::SizeType)3,
-     (TQSizePolicy::SizeType)3, 0, 0,
-     bg_Sort_Order->sizePolicy().hasHeightForWidth()	
-  ) );
-  bg_Sort_Order->setTitle( tr("Sort order for text columns (e.g. file names)") );
-//TQToolTip::add( bg_Sort_Order, tr("Select preferred order for file names, etc.") );
-
-  rb_unicodeOrderRaw = new TQRadioButton( bg_Sort_Order );
-  rb_unicodeOrderRaw->setGeometry( TQRect( 10, 20, 340, 24 ) );
-  rb_unicodeOrderRaw->setText( tr(LABEL_UNICODE_UNMODIFIED) );
-  rb_unicodeOrderRaw->setAccel( TQKeySequence( "C" ) );
-  TQToolTip::add( rb_unicodeOrderRaw, tr(TOOLTIP_UNICODE_UNMODIFIED) );
-
-  rb_unicodeOrderCaseInsensitive = new TQRadioButton( bg_Sort_Order );
-  rb_unicodeOrderCaseInsensitive->setGeometry( TQRect( 10, 50, 340, 24 ) );
-  rb_unicodeOrderCaseInsensitive->setText( tr( LABEL_UNICODE_ALPHAS_ADJACENT ) );
-  rb_unicodeOrderCaseInsensitive->setAccel( TQKeySequence( "M" ) );
-  TQToolTip::add( rb_unicodeOrderCaseInsensitive, tr(TOOLTIP_UNICODE_ALPHAS_ADJACENT) );
-
-  rb_localeOrder = new TQRadioButton( bg_Sort_Order );
-  rb_localeOrder->setGeometry( TQRect( 10, 80, 340, 24 ) );
-  rb_localeOrder->setText( tr( LABEL_LOCALE_UNMODIFIED ) );
-  rb_localeOrder->setAccel( TQKeySequence( "N" ) );
-  TQToolTip::add( rb_localeOrder, tr(TOOLTIP_LOCALE_UNMODIFIED) );
-
-  // Create check boxes pertinent to grouping
-
-  bg_Group = new TQButtonGroup( this );
-  bg_Sort_Order->setName( "bg_Group" );
-  bg_Group->setGeometry( TQRect( 20, 140, 370, 80 ) );
-  bg_Group->setSizePolicy( TQSizePolicy(
-     (TQSizePolicy::SizeType)3,
-     (TQSizePolicy::SizeType)3, 0, 0,
-     bg_Sort_Order->sizePolicy().hasHeightForWidth()	
-  ) );
-  bg_Group->setTitle( tr("Grouping") );
-//TQToolTip::add( bg_Group, tr("Select course grouping for sorted lists") );
-
-  cb_directoriesFirst = new TQCheckBox(bg_Group) ;
-  cb_directoriesFirst->setGeometry( TQRect( 20, 20, 340, 24 ) );
-  cb_directoriesFirst->setText( tr( LABEL_DIRECTORIES_FIRST ) );
-  cb_directoriesFirst->setAccel( TQKeySequence( "D" ) );
-  TQToolTip::add( cb_directoriesFirst, tr(TOOLTIP_DIRECTORIES_FIRST) );
-
-  cb_hiddenFirst = new TQCheckBox(bg_Group) ;
-  cb_hiddenFirst->setGeometry( TQRect( 20, 50, 290, 24 ) );
-  cb_hiddenFirst->setText( tr(LABEL_HIDDEN_FIRST) );
-  cb_hiddenFirst->setAccel( TQKeySequence( "H" ) );
-  TQToolTip::add( cb_hiddenFirst, tr(TOOLTIP_HIDDEN_FIRST) );
-
-  // Create dialog exit buttons
-
-  pb_Change = new TQPushButton( this, "pb_Change" );
-  pb_Change->setGeometry( TQRect( 20, 241, 170, 40 ) );
-  pb_Change->setDefault( FALSE );
-  pb_Change->setText( tr( "Save Sort Options" ) );
-  pb_Change->setAccel( TQKeySequence( "Return" ) );
-
-  pb_Cancel = new TQPushButton( this, "pb_Cancel" );
-  pb_Cancel->setGeometry( TQRect( 231, 241, 160, 40 ) );
-  pb_Cancel->setDefault( FALSE );
-  pb_Cancel->setText( tr( "Exit without Save" ) );
-  pb_Cancel->setAccel( TQKeySequence( "Esc" ) );
-
-
-  //---------------------------------------------------------------------
-
-  // Set dialog buttons & checkboxes using current / default settings
-
-  sortOrder = initial_sortOrder ;
-  switch(sortOrder) {
-    case UNICODE_UNMODIFIED :
-      rb_unicodeOrderRaw->setChecked( TRUE );
-      break;
-    case UNICODE_ALPHAS_ADJACENT :
-      rb_unicodeOrderCaseInsensitive->setChecked( TRUE );
-      break;
-    case LOCALE_DEFAULT :
-      rb_localeOrder->setChecked( TRUE );
-      break;
-    default:
-      sortOrder = UNICODE_ALPHAS_ADJACENT ;
-      rb_unicodeOrderCaseInsensitive->setChecked( TRUE );
-      break;
-  }
-
-  directoriesFirst = initial_directoriesFirst;
-  cb_directoriesFirst->setChecked( initial_directoriesFirst );
-  hiddenFirst      = initial_hiddenFirst;
-  cb_hiddenFirst->setChecked( initial_hiddenFirst );
-
-  // Finalize dialog for presentation
-
-  resize( TQSize(410, 296).expandedTo(minimumSizeHint()) );
-  clearWState( TQWidget::WState_Polished );
-
-  // Connect slots to signals
-
-  connect( rb_unicodeOrderRaw, SIGNAL( stateChanged(int) ),
-    this, SLOT( unicodeOrderRaw_stateChanged(int) )
-  );
-  connect( rb_unicodeOrderCaseInsensitive, SIGNAL( stateChanged(int) ),
-    this, SLOT( unicodeOrderCaseInsensitive_stateChanged(int) )
-  );
-  connect( rb_localeOrder, SIGNAL( stateChanged(int) ),
-    this, SLOT( localeOrder_stateChanged(int) )
-  );
-  connect( cb_directoriesFirst, SIGNAL( toggled(bool) ),
-    this, SLOT( directoriesFirst_toggled(bool) )
-  );
-  connect( cb_hiddenFirst, SIGNAL( toggled(bool) ),
-    this, SLOT( hiddenFirst_toggled(bool) )
-  );
-  connect( pb_Change, SIGNAL( clicked() ), this, SLOT( accept() ) );
-  connect( pb_Cancel, SIGNAL( clicked() ), this, SLOT( exitNoSave() ) );
-}
-
-//=============================================================================
-//  Code originally derived from tqdesigner-generated sortoptionsdialog.ui.h
-//=============================================================================
-
-void Sort_Options_Dialog::unicodeOrderRaw_stateChanged( int value )
-{
-  optionsModified = TRUE;
-  if (value > 0) {
-    sortOrder = UNICODE_UNMODIFIED ;
-    #ifdef MAKE_TEST_PGM
-    cout << "Sort order is now: unicode order (unmodified)" << endl;
-    #endif
-  }
-}
-
-void Sort_Options_Dialog::unicodeOrderCaseInsensitive_stateChanged( int value )
-{
-  optionsModified = TRUE;
-  if (value > 0) {
-    sortOrder = UNICODE_ALPHAS_ADJACENT ;
-    #ifdef MAKE_TEST_PGM
-    cout << "Sort order is now: unicode order (ASCII alphabetics adjacent)"  << endl;
-    #endif
-  }
-}
-
-void Sort_Options_Dialog::localeOrder_stateChanged( int value)
-{
-  optionsModified = TRUE;
-  if (value > 0) {
-    sortOrder = LOCALE_DEFAULT ;
-    #ifdef MAKE_TEST_PGM
-    cout << "Sort order is now: locale-defined order"  << endl;
-    #endif
-  }
-}
-
-void Sort_Options_Dialog::directoriesFirst_toggled( bool value )
-{
-  optionsModified = TRUE;
-  if (value > 0) {
-    directoriesFirst = TRUE;
-    #ifdef MAKE_TEST_PGM
-    cout << "Directories will be grouped first"  << endl;
-    #endif
-  }
-  else {
-    directoriesFirst = FALSE;
-    #ifdef MAKE_TEST_PGM
-    cout << "Directories will NOT be grouped specially"  << endl;
-    #endif
-  }
-}
-
-void Sort_Options_Dialog::hiddenFirst_toggled( bool value)
-{
-  optionsModified = TRUE;
-  if (value > 0) {
-    hiddenFirst = TRUE;
-    #ifdef MAKE_TEST_PGM
-    cout << "Hidden files will be grouped first"  << endl;
-    #endif
-  }
-  else {
-    hiddenFirst = FALSE;
-    #ifdef MAKE_TEST_PGM
-    cout << "Hidden files will NOT be grouped specially"  << endl;
-    #endif
-  }
-}
-
-void Sort_Options_Dialog::exitNoSave()
-{
-  #ifdef MAKE_TEST_PGM
-  cout << "Exiting dialog without changes"  << endl;
-  #endif
-  optionsModified = FALSE;
-  reject();
-}
-
-
-#ifdef MAKE_TEST_PGM
-
-int Get_Sort_Options( int argc, char **argv )
-{
-  cout << "Get_Sort_Options() argc: " <<  argc << endl;
-  cout << "Get_Sort_Options() argv: " << *argv << endl;
-  TQApplication app(argc, argv, TRUE);
-
-  Sort_Options_Dialog dialog( UNICODE_ALPHAS_ADJACENT, TRUE, TRUE);
-  dialog.show();
-  app.setMainWidget( &dialog );
-  int rc = app.exec();
-  if ( rc != 0 ) return rc;
-  if ( dialog.optionsModified ) {
-    printf( "Dialog RC:         %d\n", dialog.optionsModified);
-    printf( "Sort order:        %d\n", dialog.sortOrder);
-    printf( "Directories first: %d\n", dialog.directoriesFirst);
-    printf( "Hidden first:      %d\n", dialog.hiddenFirst);
-  }
-  else {
-    printf( "No changes made\n");
-  }
-  return 0;
-}
-
-int main( int argc, char **argv )
-{
-//int Display_Sort_Options_Dialog(int argc, char **argv) ;
-//Display_Sort_Options_Dialog(argc, argv);
-  Get_Sort_Options(argc, argv) ;
-  return 0 ;
-}
-
-#endif // MAKE_TEST_PGM
-
-#include "konq_sort_options_dialog.moc"
-
-/*
-
-//=============================================================================
-//  This subroutine works, except we were never able to figure out how to
-//  connect signals to handlers (slots)
-//=============================================================================
-
-int Display_Sort_Options_Dialog_Version1(int argc, char **argv)
-{
-  TQApplication app(argc, argv, TRUE);
-  TQDialog      dialog;
-
-  dialog.setName( "Sort_Options" );
-  dialog.setCaption( "Sort Ordering / Grouping Options" );
-  dialog.setModal( FALSE );
-
-  //---------------------------------------------------------------------
-
-  TQButtonGroup* Sort_Order = new TQButtonGroup( &dialog );
-  Sort_Order->setGeometry( TQRect( 10, 10, 300, 110 ) );
-  Sort_Order->setSizePolicy( TQSizePolicy(
-     (TQSizePolicy::SizeType)7,
-     (TQSizePolicy::SizeType)7, 0, 0,
-     Sort_Order->sizePolicy().hasHeightForWidth()	
-  ) );
-  Sort_Order->setTitle( "Sort Order" );
-
-  TQRadioButton* unicodeOrderRaw = new TQRadioButton( Sort_Order );
-  unicodeOrderRaw->setGeometry( TQRect( 10, 20, 180, 24 ) );
-  unicodeOrderRaw->setText( "&Unicode order - &Raw" );
-  unicodeOrderRaw->setAccel( TQKeySequence( "U" ) );
-  TQToolTip::add( unicodeOrderRaw, "Sort in strictly numeric Unicode codepoint order" );
-
-  TQRadioButton* unicodeOrderCaseInsensitive = new TQRadioButton( Sort_Order );
-  unicodeOrderCaseInsensitive->setGeometry( TQRect( 10, 50, 260, 24 ) );
-  unicodeOrderCaseInsensitive->setText( "Unicode order - &Case insensitive" );
-  unicodeOrderCaseInsensitive->setAccel( TQKeySequence( "C" ) );
-  TQToolTip::add( unicodeOrderCaseInsensitive, "Like above but with lower/upper case alphabetics adjacent" );
-
-  TQRadioButton* localeOrder = new TQRadioButton( Sort_Order );
-  localeOrder->setGeometry( TQRect( 10, 80, 120, 24 ) );
-  localeOrder->setText( "&Locale order"  );
-  localeOrder->setAccel( TQKeySequence( "L" ) );
-  TQToolTip::add( localeOrder, "Locale-defined sort order (usually \"friendly\")" );
-
-  //---------------------------------------------------------------------
-
-  TQButtonGroup* Group = new TQButtonGroup( &dialog );
-  Group->setGeometry( TQRect( 10, 140, 300, 80 ) );
-  Group->setTitle( "Grouping" );
-
-  TQCheckBox* directoriesFirst = new TQCheckBox(Group) ;
-  directoriesFirst->setGeometry( TQRect( 20, 20, 270, 24 ) );
-  directoriesFirst->setText( "&Directories before non-directories" );
-  directoriesFirst->setAccel( TQKeySequence( "D" ) );
-  TQToolTip::add( directoriesFirst, "Group directories before non-directories" );
-
-  TQCheckBox* hiddenFirst = new TQCheckBox(Group) ;
-  hiddenFirst->setGeometry( TQRect( 20, 50, 230, 24 ) );
-  hiddenFirst->setText( "&Hidden before non-hidden" );
-  hiddenFirst->setAccel( TQKeySequence( "H" ) );
-  TQToolTip::add( hiddenFirst, "Group hidden before non-hidden" );
-
-  //---------------------------------------------------------------------
-
-  //--- Set dialog buttons & checkboxes using current / default settings
-  unicodeOrderCaseInsensitive->setChecked( TRUE );
-  directoriesFirst->setChecked( TRUE );
-  hiddenFirst->setChecked( TRUE );
-
-
-  dialog.connect( directoriesFirst, SIGNAL( toggled(bool) ), SLOT( directoriesFirst_toggled(bool) ) );
-  dialog.connect( directoriesFirst, SIGNAL( toggled(bool) ), SLOT( directoriesFirst_toggled(bool) ) );
-  dialog.connect( hiddenFirst, SIGNAL( toggled(bool) ), SLOT( hiddenFirst_toggled(bool) ) );
-  dialog.connect( unicodeOrderRaw, SIGNAL( stateChanged(int) ), SLOT( unicodeOrderRaw_stateChanged(int) ) );
-  dialog.connect( unicodeOrderCaseInsensitive, SIGNAL( stateChanged(int) ), SLOT( unicodeOrderCaseInsensitive_stateChanged(int) ) );
-  dialog.connect( localeOrder, SIGNAL( stateChanged(int) ), SLOT( localeOrder_stateChanged(int) ) );
-
-  //--- Finalize & present dialog
-
-  dialog.resize( TQSize(322, 259).expandedTo(dialog.minimumSizeHint()) );
-//dialog.clearWState( TQWidget::WState_Polished );
-  app.setMainWidget( &dialog );
-  dialog.show();
-  return app.exec();
-}
-*/
-
diff --git a/libkonq/konq_sort_options_dialog.h b/libkonq/konq_sort_options_dialog.h
deleted file mode 100644
index f59e4319c..000000000
--- a/libkonq/konq_sort_options_dialog.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-** Form interface generated from reading ui file 'sortoptionsdialog.ui'
-**
-** Created by: The TQt user interface compiler (TQt 3.5.0)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-
-#ifndef SORT_OPTIONS_DIALOG_H
-#define SORT_OPTIONS_DIALOG_H
-
-#include <tqvariant.h>
-#include <tqdialog.h>
-#include "konq_sort_constants.h"
-#include <libkonq_export.h>
-
-class TQVBoxLayout;
-class TQHBoxLayout;
-class TQGridLayout;
-class TQSpacerItem;
-class TQButtonGroup;
-class TQRadioButton;
-class TQCheckBox;
-class TQPushButton;
-
-class LIBKONQ_EXPORT Sort_Options_Dialog : public TQDialog
-{
-    TQ_OBJECT
-public:
-
-  Sort_Options_Dialog(
-    TextSortOrder initial_sortOrder,
-    bool          initial_directoriesFirst,
-    bool          initial_hiddenFirst
-  );
-  ~Sort_Options_Dialog();
-
-  bool            optionsModified;
-  bool            directoriesFirst;
-  bool            hiddenFirst;
-  TextSortOrder   sortOrder;
-
-public slots:
-
-  void directoriesFirst_toggled( bool value ) ;
-  void hiddenFirst_toggled( bool value);
-  void unicodeOrderRaw_stateChanged( int value );
-  void unicodeOrderCaseInsensitive_stateChanged( int value );
-  void localeOrder_stateChanged( int value);
-  void exitNoSave();
-
-  virtual void Sort_Options_Dialog_destroyed( TQObject * );
-
-private:
-
-  TQButtonGroup* bg_Sort_Order;
-  TQRadioButton* rb_unicodeOrderRaw;
-  TQRadioButton* rb_localeOrder;
-  TQRadioButton* rb_unicodeOrderCaseInsensitive;
-  TQButtonGroup* bg_Group;
-  TQCheckBox*    cb_directoriesFirst;
-  TQCheckBox*    cb_hiddenFirst;
-  TQPushButton*  pb_Change;
-  TQPushButton*  pb_Cancel;
-};
-
-#endif // SORT_OPTIONS_DIALOG_H
diff --git a/libkonq/konq_string_compare.h b/libkonq/konq_string_compare.h
index b3d2e91a7..50682e418 100644
--- a/libkonq/konq_string_compare.h
+++ b/libkonq/konq_string_compare.h
@@ -23,7 +23,7 @@ static inline int stringCompare(
       return a.compare( b );
       break;
 
-    case UNICODE_ALPHAS_ADJACENT:
+    case UNICODE_CASEINSENSITIVE:
       /*
        * This is the traditional "case-insensitive" variation on character
        * code order that ensures that ASCII lowercase and uppercase alphabetic