Extends krandrtray, adds iccconfig kcontrol module, adds run dialog autocomplete and lots of bugfixes Will need to check for commit warnings and repair as encountered Also needs full compile test git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1061475 283d02a7-25f6-0310-bc7c-ecb5cbfe19dav3.5.13-sru
tpearson
14 years ago
parent
4aed2c8219
commit
10e4114459
@ -0,0 +1,17 @@
|
||||
AM_CPPFLAGS = $(all_includes)
|
||||
kde_module_LTLIBRARIES = kcm_iccconfig.la
|
||||
|
||||
kcm_iccconfig_la_SOURCES = iccconfig.cpp iccconfigbase.ui iccconfig.skel
|
||||
|
||||
kcm_iccconfig_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
|
||||
|
||||
kcm_iccconfig_la_LIBADD = -lkdeui $(LIB_KIO)
|
||||
|
||||
METASOURCES = AUTO
|
||||
|
||||
noinst_HEADERS = iccconfig.h
|
||||
|
||||
messages: rc.cpp
|
||||
$(XGETTEXT) *.cpp -o $(podir)/kcmiccconfig.pot
|
||||
|
||||
xdg_apps_DATA = iccconfig.desktop
|
||||
@ -0,0 +1,7 @@
|
||||
case "$host" in
|
||||
*-*-linux*)
|
||||
FOUND_LINUX=yes
|
||||
;;
|
||||
esac
|
||||
|
||||
AM_CONDITIONAL(include_kcontrol_iccconfig, test "$FOUND_LINUX" = "yes")
|
||||
@ -0,0 +1,166 @@
|
||||
/**
|
||||
* smartcard.cpp
|
||||
*
|
||||
* Copyright (c) 2001 George Staikos <staikos@kde.org>
|
||||
* Copyright (c) 2001 Fernando Llobregat <fernando.llobregat@free.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#include "iccconfig.h"
|
||||
|
||||
#include <qcheckbox.h>
|
||||
#include <qlabel.h>
|
||||
#include <qlayout.h>
|
||||
#include <qlineedit.h>
|
||||
#include <qpushbutton.h>
|
||||
|
||||
#include <dcopclient.h>
|
||||
|
||||
#include <kaboutdata.h>
|
||||
#include <kapplication.h>
|
||||
#include <kconfig.h>
|
||||
#include <kdebug.h>
|
||||
#include <kdialog.h>
|
||||
#include <kglobal.h>
|
||||
#include <klistview.h>
|
||||
#include <klocale.h>
|
||||
#include <kmessagebox.h>
|
||||
#include <kpopupmenu.h>
|
||||
#include <kurlrequester.h>
|
||||
#include <kgenericfactory.h>
|
||||
|
||||
#include <unistd.h>
|
||||
#include <ksimpleconfig.h>
|
||||
#include <string>
|
||||
#include <stdio.h>
|
||||
#include <qstring.h>
|
||||
|
||||
using namespace std;
|
||||
|
||||
/**** DLL Interface ****/
|
||||
typedef KGenericFactory<KICCConfig, QWidget> KICCCFactory;
|
||||
K_EXPORT_COMPONENT_FACTORY( kcm_iccconfig, KICCCFactory("kcmiccconfig") )
|
||||
|
||||
KSimpleConfig *config;
|
||||
|
||||
/**** KICCConfig ****/
|
||||
|
||||
KICCConfig::KICCConfig(QWidget *parent, const char *name, const QStringList &)
|
||||
: KCModule(KICCCFactory::instance(), parent, name)
|
||||
{
|
||||
|
||||
QVBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
|
||||
config = new KSimpleConfig( QString::fromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" ));
|
||||
|
||||
KAboutData *about =
|
||||
new KAboutData(I18N_NOOP("kcmiccconfig"), I18N_NOOP("KDE ICC Profile Control Module"),
|
||||
0, 0, KAboutData::License_GPL,
|
||||
I18N_NOOP("(c) 2009 Timothy Pearson"));
|
||||
|
||||
about->addAuthor("Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net");
|
||||
setAboutData( about );
|
||||
|
||||
base = new ICCConfigBase(this);
|
||||
layout->add(base);
|
||||
|
||||
setRootOnlyMsg(i18n("<b>The ICC color profile is a system wide setting, and requires administrator access</b><br>To alter the system's ICC profile, click on the \"Administrator Mode\" button below."));
|
||||
setUseRootOnlyMsg(true);
|
||||
|
||||
connect(base->enableSupport, SIGNAL(clicked()), SLOT(changed()));
|
||||
connect(base->enableSupport, SIGNAL(toggled(bool)), base->iccFile, SLOT(setEnabled(bool)));
|
||||
|
||||
connect(base->iccFile, SIGNAL(textChanged(const QString&)), SLOT(changed()));
|
||||
|
||||
load();
|
||||
|
||||
if (getuid() != 0 || !config->checkConfigFilesWritable( true )) {
|
||||
base->enableSupport->setEnabled(false);
|
||||
base->iccFile->setEnabled(false);
|
||||
}
|
||||
}
|
||||
|
||||
KICCConfig::~KICCConfig()
|
||||
{
|
||||
delete config;
|
||||
}
|
||||
|
||||
void KICCConfig::load()
|
||||
{
|
||||
load( false );
|
||||
}
|
||||
|
||||
void KICCConfig::load(bool useDefaults )
|
||||
{
|
||||
//Update the toggle buttons with the current configuration
|
||||
|
||||
config->setReadDefaults( useDefaults );
|
||||
|
||||
base->enableSupport->setChecked(config->readBoolEntry("EnableICC", false));
|
||||
base->iccFile->setEnabled(config->readBoolEntry("EnableICC", false));
|
||||
base->iccFile->setURL(config->readEntry("ICCFile"));
|
||||
|
||||
emit changed(useDefaults);
|
||||
}
|
||||
|
||||
void KICCConfig::save()
|
||||
{
|
||||
config->writeEntry("EnableICC", base->enableSupport->isChecked());
|
||||
config->writeEntry("ICCFile", base->iccFile->url());
|
||||
|
||||
if (base->enableSupport->isChecked()) {
|
||||
// Apply ICC settings with XCalib
|
||||
string icc_command="/usr/bin/xcalib ";
|
||||
FILE *pipe_xcalib;
|
||||
char xcalib_result[2048];
|
||||
int i;
|
||||
xcalib_result[0]=0;
|
||||
|
||||
icc_command.append(base->iccFile->url().ascii());
|
||||
if ((pipe_xcalib = popen(icc_command.c_str(), "r")) == NULL)
|
||||
{
|
||||
printf("Xcalib pipe error\n\r");
|
||||
}
|
||||
else {
|
||||
fgets(xcalib_result, 2048, pipe_xcalib);
|
||||
pclose(pipe_xcalib);
|
||||
for (i=1;i<2048;i++) {
|
||||
if (xcalib_result[i] == 0) {
|
||||
xcalib_result[i-1]=0;
|
||||
i=2048;
|
||||
}
|
||||
}
|
||||
if (strlen(xcalib_result) > 2) {
|
||||
KMessageBox::error(this, QString("Unable to apply ICC configuration:\n\r%1").arg(xcalib_result));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
emit changed(false);
|
||||
}
|
||||
|
||||
void KICCConfig::defaults()
|
||||
{
|
||||
load( true );
|
||||
}
|
||||
|
||||
QString KICCConfig::quickHelp() const
|
||||
{
|
||||
return i18n("<h1>ICC Profile Configuration</h1> This module allows you to configure KDE support"
|
||||
" for ICC profiles. This allows you to easily color correct your monitor"
|
||||
" for a more lifelike and vibrant image.");
|
||||
}
|
||||
|
||||
#include "iccconfig.moc"
|
||||
@ -0,0 +1,21 @@
|
||||
[Desktop Entry]
|
||||
Exec=kcmshell iccconfig
|
||||
Icon=kcoloredit
|
||||
Type=Application
|
||||
DocPath=kcontrol/iccconfig/index.html
|
||||
|
||||
X-KDE-Library=iccconfig
|
||||
X-KDE-ParentApp=kcontrol
|
||||
X-KDE-RootOnly=true
|
||||
X-KDE-SubstituteUID=true
|
||||
|
||||
Categories=Qt;KDE;X-KDE-settings-peripherals;
|
||||
Comment=Configure display ICC profile
|
||||
Comment[en_US]=Configure display ICC profile
|
||||
DocPath=kcontrol/iccconfig.html
|
||||
GenericName=
|
||||
GenericName[en_US]=
|
||||
Keywords=ICC,display,color,profile
|
||||
MimeType=
|
||||
Name=ICC Color Profile
|
||||
Name[en_US]=ICC Color Profile
|
||||
@ -0,0 +1,71 @@
|
||||
/**
|
||||
* iccconfig.h
|
||||
*
|
||||
* Copyright (c) 2009 Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#ifndef _KCM_ICCCONFIG_H
|
||||
#define _KCM_ICCCONFIG_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <dcopobject.h>
|
||||
|
||||
#include <kcmodule.h>
|
||||
|
||||
#include "iccconfigbase.h"
|
||||
|
||||
class KConfig;
|
||||
class KPopupMenu;
|
||||
class KListViewItem;
|
||||
|
||||
class KICCConfig : public KCModule, public DCOPObject
|
||||
{
|
||||
K_DCOP
|
||||
Q_OBJECT
|
||||
|
||||
|
||||
public:
|
||||
//KICCConfig(QWidget *parent = 0L, const char *name = 0L);
|
||||
KICCConfig(QWidget *parent, const char *name, const QStringList &);
|
||||
virtual ~KICCConfig();
|
||||
|
||||
ICCConfigBase *base;
|
||||
|
||||
void load();
|
||||
void load( bool useDefaults);
|
||||
void save();
|
||||
void defaults();
|
||||
|
||||
int buttons();
|
||||
QString quickHelp() const;
|
||||
|
||||
k_dcop:
|
||||
|
||||
private:
|
||||
|
||||
KConfig *config;
|
||||
bool _ok;
|
||||
KPopupMenu * _popUpKardChooser;
|
||||
|
||||
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -0,0 +1,102 @@
|
||||
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
|
||||
<class>ICCConfigBase</class>
|
||||
<widget class="QWidget">
|
||||
<property name="name">
|
||||
<cstring>ICCConfigBase</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>519</width>
|
||||
<height>356</height>
|
||||
</rect>
|
||||
</property>
|
||||
<grid>
|
||||
<property name="name">
|
||||
<cstring>unnamed</cstring>
|
||||
</property>
|
||||
<widget class="QTabWidget" row="0" column="0">
|
||||
<property name="name">
|
||||
<cstring>TabWidget2</cstring>
|
||||
</property>
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<widget class="QWidget">
|
||||
<property name="name">
|
||||
<cstring>tab</cstring>
|
||||
</property>
|
||||
<attribute name="title">
|
||||
<string>ICC Color Profile Configuration</string>
|
||||
</attribute>
|
||||
<grid>
|
||||
<property name="name">
|
||||
<cstring>unnamed</cstring>
|
||||
</property>
|
||||
<widget class="QCheckBox" row="0" column="0" colspan="2">
|
||||
<property name="name">
|
||||
<cstring>enableSupport</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>&Enable global ICC color profile support</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="KURLRequester" row="1" column="1">
|
||||
<property name="name">
|
||||
<cstring>iccFile</cstring>
|
||||
</property>
|
||||
<property name="filter">
|
||||
<string>*.icc</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" row="1" column="0">
|
||||
<property name="name">
|
||||
<cstring>textLabel2_2</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>ICC File</string>
|
||||
</property>
|
||||
</widget>
|
||||
<spacer row="2" column="0">
|
||||
<property name="name" stdset="0">
|
||||
<cstring>Spacer4</cstring>
|
||||
</property>
|
||||
<property name="orientation">
|
||||
<enum>Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeType">
|
||||
<enum>Expanding</enum>
|
||||
</property>
|
||||
<property name="sizeHint">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</grid>
|
||||
</widget>
|
||||
</widget>
|
||||
</grid>
|
||||
</widget>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>enableSupport</sender>
|
||||
<signal>toggled(bool)</signal>
|
||||
<receiver>ICCConfigBase</receiver>
|
||||
<slot>enableSupport_toggled(bool)</slot>
|
||||
</connection>
|
||||
</connections>
|
||||
<includes>
|
||||
<include location="local" impldecl="in implementation">ICCConfigBase.ui.h</include>
|
||||
</includes>
|
||||
<slots>
|
||||
<slot>enableSupport_toggled(bool)</slot>
|
||||
</slots>
|
||||
<includes>
|
||||
<include location="local" impldecl="in implementation">kdialog.h</include>
|
||||
</includes>
|
||||
<layoutdefaults spacing="3" margin="6"/>
|
||||
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
|
||||
</UI>
|
||||
@ -0,0 +1,104 @@
|
||||
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
|
||||
<class>ICCConfigBase</class>
|
||||
<widget class="QWidget">
|
||||
<property name="name">
|
||||
<cstring>ICCConfigBase</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>519</width>
|
||||
<height>356</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="caption">
|
||||
<string>ICCConfigBase</string>
|
||||
</property>
|
||||
<grid>
|
||||
<property name="name">
|
||||
<cstring>unnamed</cstring>
|
||||
</property>
|
||||
<widget class="QTabWidget" row="0" column="0">
|
||||
<property name="name">
|
||||
<cstring>TabWidget2</cstring>
|
||||
</property>
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<widget class="QWidget">
|
||||
<property name="name">
|
||||
<cstring>tab</cstring>
|
||||
</property>
|
||||
<attribute name="title">
|
||||
<string>ICC Color Profile Configuration</string>
|
||||
</attribute>
|
||||
<grid>
|
||||
<property name="name">
|
||||
<cstring>unnamed</cstring>
|
||||
</property>
|
||||
<widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2">
|
||||
<property name="name">
|
||||
<cstring>enableSupport</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>&Enable ICC color profile support</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="KURLRequester" row="1" column="1">
|
||||
<property name="name">
|
||||
<cstring>editPCF</cstring>
|
||||
</property>
|
||||
<property name="filter">
|
||||
<string>.icc</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" row="1" column="0">
|
||||
<property name="name">
|
||||
<cstring>textLabel2_2</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>ICC File</string>
|
||||
</property>
|
||||
</widget>
|
||||
<spacer row="2" column="0">
|
||||
<property name="name">
|
||||
<cstring>Spacer4</cstring>
|
||||
</property>
|
||||
<property name="orientation">
|
||||
<enum>Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeType">
|
||||
<enum>Expanding</enum>
|
||||
</property>
|
||||
<property name="sizeHint">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</grid>
|
||||
</widget>
|
||||
</widget>
|
||||
</grid>
|
||||
</widget>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>enableSupport</sender>
|
||||
<signal>toggled(bool)</signal>
|
||||
<receiver>ICCConfigBase</receiver>
|
||||
<slot>enableSupport_toggled(bool)</slot>
|
||||
</connection>
|
||||
</connections>
|
||||
<slots>
|
||||
<slot>enableSupport_toggled(bool)</slot>
|
||||
</slots>
|
||||
<layoutdefaults spacing="3" margin="6"/>
|
||||
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
|
||||
<includehints>
|
||||
<includehint>kurlrequester.h</includehint>
|
||||
<includehint>klineedit.h</includehint>
|
||||