[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    [patch] Re: Set shadowSortColumn false per default
From:       Martin Koller <m.koller () surfeu ! at>
Date:       2004-12-28 11:19:27
Message-ID: 200412281219.32019.m.koller () surfeu ! at
[Download RAW message or body]

[Attachment #2 (multipart/mixed)]


On Monday 27 December 2004 18:52, Ingo Klöcker wrote:
> Obviously, the real point of disagreement is not the default behavior
> but the fact that it's not configurable. So, regardless of the default,
> pretty please with sugar on top make it configurable (at least via
> KConfEdit).

OK, what about adding a checkbox in the colors KCM and storing it in 
kdeglobals/General ? (So it's also a member of a color scheme)

See attached patch.

-- 
Best regards/Schöne Grüße

Martin    ()  ascii ribbon campaign - against html mail 
          /\                        - against microsoft attachments

       Some operating systems are called 'user friendly',
             Linux however is 'expert friendly'.

["shadeconfig-base.patch" (text/x-diff)]

Index: kcontrol/colors/colorscm.cpp
===================================================================
RCS file: /home/kde/kdebase/kcontrol/colors/colorscm.cpp,v
retrieving revision 1.95
diff -u -3 -p -r1.95 colorscm.cpp
--- kcontrol/colors/colorscm.cpp	22 Oct 2004 19:11:11 -0000	1.95
+++ kcontrol/colors/colorscm.cpp	28 Dec 2004 11:15:37 -0000
@@ -238,6 +238,13 @@ KColorScheme::KColorScheme(QWidget *pare
        " box where you can choose a color for the \"widget\" selected"
        " in the above list.") );
 
+    cbShadeList = new QCheckBox(i18n("Shade sorted column in lists"), this);
+    stackLayout->addWidget(cbShadeList);
+    connect(cbShadeList, SIGNAL(toggled(bool)), this, SLOT(changed()));
+
+    QWhatsThis::add(cbShadeList,
+       i18n("Check this box to show the sorted column in a list with a shaded background"));
+
     group = new QGroupBox(  i18n("Con&trast"), this );
     stackLayout->addWidget(group);
 
@@ -293,6 +300,8 @@ void KColorScheme::load()
     sList->setCurrentItem(findSchemeByName(sCurrentScheme));
     readScheme(0);
 
+    cbShadeList->setChecked(cs->shadeSortColumn);
+
     cs->drawSampleWidgets();
     slotWidgetColor(wcCombo->currentItem());
     sb->blockSignals(true);
@@ -324,6 +333,8 @@ void KColorScheme::save()
     cfg->writeEntry("visitedLinkColor", cs->visitedLink, true, true);
     cfg->writeEntry("alternateBackground", cs->alternateBackground, true, true);
 
+    cfg->writeEntry("shadeSortColumn", cbShadeList->isChecked());
+
     cfg->setGroup( "WM" );
     cfg->writeEntry("activeForeground", cs->aTxt, true, true);
     cfg->writeEntry("inactiveBackground", cs->iaTitle, true, true);
@@ -400,6 +411,8 @@ void KColorScheme::defaults()
     readScheme(1);
     sList->setCurrentItem(1);
 
+    cbShadeList->setChecked(cs->shadeSortColumn);
+
     cs->drawSampleWidgets();
     slotWidgetColor(wcCombo->currentItem());
     sb->blockSignals(true);
@@ -754,6 +767,7 @@ void KColorScheme::readScheme( int index
       cs->alternateBackground = KGlobalSettings::calculateAlternateBackgroundColor(cs->window);
 
       cs->contrast    = 7;
+      cs->shadeSortColumn = KDE_DEFAULT_SHADE_SORT_COLUMN;
 
       return;
     }
@@ -774,6 +788,8 @@ void KColorScheme::readScheme( int index
         sCurrentScheme = sCurrentScheme.mid(i+1);
     }
 
+    cs->shadeSortColumn = config->readBoolEntry( "shadeSortColumn", KDE_DEFAULT_SHADE_SORT_COLUMN );
+
     // note: defaults should be the same as the KDE default
     cs->txt = config->readColorEntry( "foreground", &black );
     cs->back = config->readColorEntry( "background", &widget );
@@ -897,6 +913,8 @@ void KColorScheme::slotPreviewScheme(int
 
     // Set various appropriate for the scheme
 
+    cbShadeList->setChecked(cs->shadeSortColumn);
+
     cs->drawSampleWidgets();
     sb->blockSignals(true);
     sb->setValue(cs->contrast);
Index: kcontrol/colors/colorscm.h
===================================================================
RCS file: /home/kde/kdebase/kcontrol/colors/colorscm.h,v
retrieving revision 1.15
diff -u -3 -p -r1.15 colorscm.h
--- kcontrol/colors/colorscm.h	22 Oct 2004 19:11:11 -0000	1.15
+++ kcontrol/colors/colorscm.h	28 Dec 2004 11:15:37 -0000
@@ -82,6 +82,7 @@ private:
     WidgetCanvas *cs;
     
     QCheckBox *cbExportColors;
+    QCheckBox *cbShadeList;
 };
 
 #endif
Index: kcontrol/colors/widgetcanvas.cpp
===================================================================
RCS file: /home/kde/kdebase/kcontrol/colors/widgetcanvas.cpp,v
retrieving revision 1.13
diff -u -3 -p -r1.13 widgetcanvas.cpp
--- kcontrol/colors/widgetcanvas.cpp	23 Dec 2003 17:29:41 -0000	1.13
+++ kcontrol/colors/widgetcanvas.cpp	28 Dec 2004 11:15:37 -0000
@@ -42,7 +42,7 @@ static QPixmap* dis_menu_pix = 0;
 
 
 WidgetCanvas::WidgetCanvas( QWidget *parent, const char *name )
-	: QWidget( parent, name  )
+	: QWidget( parent, name  ), shadeSortColumn( true )
 {
     setMouseTracking( true );
     setBackgroundMode( NoBackground );
Index: kcontrol/colors/widgetcanvas.h
===================================================================
RCS file: /home/kde/kdebase/kcontrol/colors/widgetcanvas.h,v
retrieving revision 1.5
diff -u -3 -p -r1.5 widgetcanvas.h
--- kcontrol/colors/widgetcanvas.h	23 Oct 2003 05:19:48 -0000	1.5
+++ kcontrol/colors/widgetcanvas.h	28 Dec 2004 11:15:37 -0000
@@ -95,6 +95,7 @@ public:
     QColor alternateBackground;
 
     int contrast;
+    bool shadeSortColumn;
 
 signals:
     void widgetSelected( int );
Index: konqueror/listview/konq_listviewwidget.cc
===================================================================
RCS file: /home/kde/kdebase/konqueror/listview/konq_listviewwidget.cc,v
retrieving revision 1.260
diff -u -3 -p -r1.260 konq_listviewwidget.cc
--- konqueror/listview/konq_listviewwidget.cc	24 Dec 2004 11:56:39 -0000	1.260
+++ konqueror/listview/konq_listviewwidget.cc	28 Dec 2004 11:15:42 -0000
@@ -115,7 +115,6 @@ KonqBaseListViewWidget::KonqBaseListView
    setSelectionModeExt( FileManager );
    setDragEnabled(true);
    setItemsMovable(false);
-   setShadeSortColumn(true);
 
    initConfig();
 #if 0

["shadeconfig-libs.patch" (text/x-diff)]

Index: kdecore/kglobalsettings.cpp
===================================================================
RCS file: /home/kde/kdelibs/kdecore/kglobalsettings.cpp,v
retrieving revision 1.84
diff -u -3 -p -r1.84 kglobalsettings.cpp
--- kdecore/kglobalsettings.cpp	26 Oct 2004 17:30:49 -0000	1.84
+++ kdecore/kglobalsettings.cpp	28 Dec 2004 11:13:29 -0000
@@ -271,6 +271,12 @@ QColor KGlobalSettings::calculateAlterna
     }
 }
 
+bool KGlobalSettings::shadeSortColumn()
+{
+    KConfigGroup g( KGlobal::config(), "General" );
+    return g.readBoolEntry( "shadeSortColumn", KDE_DEFAULT_SHADE_SORT_COLUMN );
+}
+
 QColor KGlobalSettings::linkColor()
 {
     initColors();
Index: kdecore/kglobalsettings.h
===================================================================
RCS file: /home/kde/kdelibs/kdecore/kglobalsettings.h,v
retrieving revision 1.56
diff -u -3 -p -r1.56 kglobalsettings.h
--- kdecore/kglobalsettings.h	24 Sep 2004 12:15:09 -0000	1.56
+++ kdecore/kglobalsettings.h	28 Dec 2004 11:13:30 -0000
@@ -34,6 +34,7 @@
 #define KDE_DEFAULT_ICON_ON_PUSHBUTTON false
 #define KDE_DEFAULT_OPAQUE_RESIZE true
 #define KDE_DEFAULT_BUTTON_LAYOUT 0
+#define KDE_DEFAULT_SHADE_SORT_COLUMN true
 
 class KURL;
 
@@ -342,6 +343,13 @@ class KDECORE_EXPORT KGlobalSettings
      */
     static QColor calculateAlternateBackgroundColor(const QColor& base);
 
+    /**
+      * Returns if the sorted column in a KListView shall be drawn with a
+      * shaded background color.
+      * @return true if the sorted column shall be shaded
+      * @since 3.4
+      */
+    static bool shadeSortColumn();
 
     /**
      * Returns the default general font.
Index: kdeui/klistview.cpp
===================================================================
RCS file: /home/kde/kdelibs/kdeui/klistview.cpp,v
retrieving revision 1.249
diff -u -3 -p -r1.249 klistview.cpp
--- kdeui/klistview.cpp	20 Dec 2004 21:45:55 -0000	1.249
+++ kdeui/klistview.cpp	28 Dec 2004 11:13:32 -0000
@@ -101,7 +101,7 @@ public:
       paintCurrent (0),
       paintBelow (0),
       painting (false),
-      shadeSortColumn (false)
+      shadeSortColumn(KGlobalSettings::shadeSortColumn())
   {
       renameable.append(0);
       connect(editor, SIGNAL(done(QListViewItem*,int)), listview, \
SLOT(doneEditing(QListViewItem*,int)));


[Attachment #7 (application/pgp-signature)]

[prev in list] [next in list] [prev in thread] [next in thread]