TDE
/
knutclient
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/knutclient
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KIcon to enhance compatibility with KDE4

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent 5a480fa575
commit 9637803529
8 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File

20
src/knutclient.cpp
Unescape View File

@ -377,9 +377,9 @@ void KNutClient::initVars (void) {
settingData.analogScaleColor=kapp->config()->readColorEntry ("AnalogScaleColor",& DEFAULT_SCALE_COLOR); settingData.analogScaleColor=kapp->config()->readColorEntry ("AnalogScaleColor",& DEFAULT_SCALE_COLOR);
settingData.analogFontColor=kapp->config()->readColorEntry ("AnalogFontColor",& DEFAULT_FONT_COLOR); settingData.analogFontColor=kapp->config()->readColorEntry ("AnalogFontColor",& DEFAULT_FONT_COLOR);
settingData.toolTipFlags=kapp->config()->readUnsignedNumEntry("ToolTipFlags",KNutDock::DefaultToolTipFlags); settingData.toolTipFlags=kapp->config()->readUnsignedNumEntry("ToolTipFlags",KNutDock::DefaultToolTipFlags);
settingData.customKIconColor=kapp->config()->readBoolEntry("CustomKIconColor",FALSE); settingData.customTDEIconColor=kapp->config()->readBoolEntry("CustomTDEIconColor",FALSE);
settingData.kIconBackgroundColor=kapp->config()->readColorEntry ("KIconBackGroundColor",& DEFAULT_KICON_COLOR); settingData.kIconBackgroundColor=kapp->config()->readColorEntry ("TDEIconBackGroundColor",& DEFAULT_KICON_COLOR);
settingData.typeOfKIcon=kapp->config()->readBoolEntry("TypeOfKIcon", KNutDock::pictureKI); settingData.typeOfTDEIcon=kapp->config()->readBoolEntry("TypeOfTDEIcon", KNutDock::pictureKI);
settingData.typeDigitalProcessing=kapp->config()->readNumEntry("DigitalProcessingOfPointers", 2); settingData.typeDigitalProcessing=kapp->config()->readNumEntry("DigitalProcessingOfPointers", 2);
@ -439,9 +439,9 @@ void KNutClient::saveConfiguration ( bool all ) {
if (all) { if (all) {
kapp->config()->writeEntry ("DigitalProcessingOfPointers",settingData.typeDigitalProcessing); kapp->config()->writeEntry ("DigitalProcessingOfPointers",settingData.typeDigitalProcessing);
kapp->config()->writeEntry ("TypeOfKIcon",settingData.typeOfKIcon); kapp->config()->writeEntry ("TypeOfTDEIcon",settingData.typeOfTDEIcon);
kapp->config()->writeEntry ("KIconBackGroundColor",settingData.kIconBackgroundColor); kapp->config()->writeEntry ("TDEIconBackGroundColor",settingData.kIconBackgroundColor);
kapp->config()->writeEntry ("CustomKIconColor",(settingData.customKIconColor)); kapp->config()->writeEntry ("CustomTDEIconColor",(settingData.customTDEIconColor));
kapp->config()->writeEntry ("ToolTipFlags",(settingData.toolTipFlags)); kapp->config()->writeEntry ("ToolTipFlags",(settingData.toolTipFlags));
} }
@ -995,15 +995,15 @@ void KNutClient::slotSetConfig (unsigned int changeSetting) {
if (m_myDock) m_myDock->changeUps(); if (m_myDock) m_myDock->changeUps();
} }
if (changeSetting & KNutPrefDlg::ChangeTypeOfKIcon) { if (changeSetting & KNutPrefDlg::ChangeTypeOfTDEIcon) {
if (m_myDock) m_myDock->changeKIcon(); if (m_myDock) m_myDock->changeTDEIcon();
} }
if (changeSetting & KNutPrefDlg::ChangeCustomKIconColor) { if (changeSetting & KNutPrefDlg::ChangeCustomTDEIconColor) {
if (m_myDock) m_myDock->changeKIBColor(); if (m_myDock) m_myDock->changeKIBColor();
} }
if (changeSetting & KNutPrefDlg::ChangeKIconBColor) { if (changeSetting & KNutPrefDlg::ChangeTDEIconBColor) {
if (m_myDock) m_myDock->changeKIBColor(); if (m_myDock) m_myDock->changeKIBColor();
} }

18
src/knutdock.cpp
Unescape View File

@ -51,9 +51,9 @@ KNutDock::KNutDock(KNutVarData::upsInfoDef* activeUpsInfo, KNutVarData::SettingD
//saves backgroundcolor of kicker //saves backgroundcolor of kicker
backgroundColor = paletteBackgroundColor(); backgroundColor = paletteBackgroundColor();
m_typeOfIcon = m_settingData->typeOfKIcon; m_typeOfIcon = m_settingData->typeOfTDEIcon;
if (!m_settingData->customKIconColor) m_myBGColor = backgroundColor; if (!m_settingData->customTDEIconColor) m_myBGColor = backgroundColor;
else m_myBGColor = m_settingData->kIconBackgroundColor; else m_myBGColor = m_settingData->kIconBackgroundColor;
m_toolTipFlags=m_settingData->toolTipFlags; m_toolTipFlags=m_settingData->toolTipFlags;
@ -61,8 +61,8 @@ KNutDock::KNutDock(KNutVarData::upsInfoDef* activeUpsInfo, KNutVarData::SettingD
clearValues(); clearValues();
KIconLoader *loader = TDEGlobal::iconLoader(); TDEIconLoader *loader = TDEGlobal::iconLoader();
m_mainPix = loader->loadIcon ("knutclient",KIcon::Small,16); m_mainPix = loader->loadIcon ("knutclient",TDEIcon::Small,16);
// aplications's own icons // aplications's own icons
m_errorPix = UserIcon ("knc_error"); m_errorPix = UserIcon ("knc_error");
@ -82,7 +82,7 @@ KNutDock::KNutDock(KNutVarData::upsInfoDef* activeUpsInfo, KNutVarData::SettingD
initImage(); initImage();
changeKIcon(); // this function calls function repaintIcon changeTDEIcon(); // this function calls function repaintIcon
} }
@ -102,7 +102,7 @@ KNutDock::~KNutDock(){
void KNutDock::resizeEvent ( TQResizeEvent * ){ void KNutDock::resizeEvent ( TQResizeEvent * ){
initImage(); initImage();
changeKIcon(); // this function calls function repaintIcon changeTDEIcon(); // this function calls function repaintIcon
} }
void KNutDock::changeUps (void) { void KNutDock::changeUps (void) {
@ -130,15 +130,15 @@ void KNutDock::changeToolTip(void){
void KNutDock::changeKIBColor(void) { void KNutDock::changeKIBColor(void) {
if (!m_settingData->customKIconColor) m_myBGColor = backgroundColor; if (!m_settingData->customTDEIconColor) m_myBGColor = backgroundColor;
else m_myBGColor = m_settingData->kIconBackgroundColor; // uses defined color else m_myBGColor = m_settingData->kIconBackgroundColor; // uses defined color
repaintDock(true); repaintDock(true);
} }
void KNutDock::changeKIcon (void) { void KNutDock::changeTDEIcon (void) {
m_typeOfIcon = m_settingData->typeOfKIcon; m_typeOfIcon = m_settingData->typeOfTDEIcon;
if ( m_typeOfIcon == generalKI) { if ( m_typeOfIcon == generalKI) {
if (m_mainLayer) { if (m_mainLayer) {

2
src/knutdock.h
Unescape View File

@ -118,7 +118,7 @@ class KNutDock : public KSystemTray {
* *
* @since 0.1 * @since 0.1
**/ **/
void changeKIcon (void); void changeTDEIcon (void);
/** /**
* Zmeni pozadi icony v kickeru * Zmeni pozadi icony v kickeru

8
src/knutmessage.cpp
Unescape View File

@ -31,17 +31,17 @@ KNutMessage::KNutMessage(const TQString messageText, const typeOfMessage type, c
setCaption("KNutClient"); setCaption("KNutClient");
m_messageTimer = 0; m_messageTimer = 0;
KIconLoader *loader = TDEGlobal::iconLoader(); TDEIconLoader *loader = TDEGlobal::iconLoader();
switch(type) { switch(type) {
case infoMess: case infoMess:
m_ret = loader->loadIcon("messagebox_info", KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true); m_ret = loader->loadIcon("messagebox_info", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true);
break; break;
case warningMess: case warningMess:
m_ret = loader->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true); m_ret = loader->loadIcon("messagebox_warning", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true);
break; break;
case criticalMess: case criticalMess:
m_ret = loader->loadIcon("messagebox_critical", KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true); m_ret = loader->loadIcon("messagebox_critical", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true);
break; break;
} }

36
src/knutprefdlg.cpp
Unescape View File

@ -404,22 +404,22 @@ void KNutPrefDlg::slotApply() {
// Kicker Icon page // Kicker Icon page
int stateKIcon; int stateTDEIcon;
if (m_iconRadioButton1->isChecked()) stateKIcon = KNutDock::pictureKI; if (m_iconRadioButton1->isChecked()) stateTDEIcon = KNutDock::pictureKI;
else stateKIcon = KNutDock::generalKI; else stateTDEIcon = KNutDock::generalKI;
if (m_settingData->typeOfKIcon != stateKIcon) { if (m_settingData->typeOfTDEIcon != stateTDEIcon) {
if (m_iconRadioButton1->isChecked()) m_settingData->typeOfKIcon = KNutDock::pictureKI; if (m_iconRadioButton1->isChecked()) m_settingData->typeOfTDEIcon = KNutDock::pictureKI;
if (m_iconRadioButton2->isChecked()) m_settingData->typeOfKIcon = KNutDock::generalKI; if (m_iconRadioButton2->isChecked()) m_settingData->typeOfTDEIcon = KNutDock::generalKI;
changeSetting += ChangeTypeOfKIcon; changeSetting += ChangeTypeOfTDEIcon;
} }
if (m_settingData->customKIconColor != m_checkBoxCbi->isChecked()) { if (m_settingData->customTDEIconColor != m_checkBoxCbi->isChecked()) {
m_settingData->customKIconColor = m_checkBoxCbi->isChecked(); m_settingData->customTDEIconColor = m_checkBoxCbi->isChecked();
changeSetting += ChangeCustomKIconColor; changeSetting += ChangeCustomTDEIconColor;
} }
if (m_settingData->kIconBackgroundColor != m_BGIButton->color()) { if (m_settingData->kIconBackgroundColor != m_BGIButton->color()) {
changeSetting += ChangeKIconBColor; changeSetting += ChangeTDEIconBColor;
m_settingData->kIconBackgroundColor = m_BGIButton->color(); // nastavime barvu pozadi m_settingData->kIconBackgroundColor = m_BGIButton->color(); // nastavime barvu pozadi
} }
@ -717,9 +717,9 @@ void KNutPrefDlg::initDock () {
typeLayout->addWidget ( m_iconRadioButton1,1,0 ); typeLayout->addWidget ( m_iconRadioButton1,1,0 );
typeLayout->addWidget ( m_iconRadioButton2,2,0 ); typeLayout->addWidget ( m_iconRadioButton2,2,0 );
if (m_settingData->typeOfKIcon == KNutDock::pictureKI) if (m_settingData->typeOfTDEIcon == KNutDock::pictureKI)
m_iconRadioButton1->setChecked( true ); m_iconRadioButton1->setChecked( true );
if (m_settingData->typeOfKIcon == KNutDock::generalKI) if (m_settingData->typeOfTDEIcon == KNutDock::generalKI)
m_iconRadioButton2->setChecked( true ); m_iconRadioButton2->setChecked( true );
infoLayout->addRowSpacing (0 ,fontMetrics().lineSpacing() ); infoLayout->addRowSpacing (0 ,fontMetrics().lineSpacing() );
@ -736,10 +736,10 @@ void KNutPrefDlg::initDock () {
colorLayout->addWidget (m_dockBackgroundColorLabel,1,0); colorLayout->addWidget (m_dockBackgroundColorLabel,1,0);
colorLayout->addWidget (m_BGIButton,1,1); colorLayout->addWidget (m_BGIButton,1,1);
m_checkBoxCbi->setChecked(m_settingData->customKIconColor); m_checkBoxCbi->setChecked(m_settingData->customTDEIconColor);
m_BGIButton->setColor(m_settingData->kIconBackgroundColor); m_BGIButton->setColor(m_settingData->kIconBackgroundColor);
// m_BGIButton->setEnabled(m_prefData->customKIconColor); // m_BGIButton->setEnabled(m_prefData->customTDEIconColor);
// m_dockBackgroundColorLabel->setEnabled(m_prefData->customKIconColor); // m_dockBackgroundColorLabel->setEnabled(m_prefData->customTDEIconColor);
if (m_iconRadioButton1->isChecked()) { if (m_iconRadioButton1->isChecked()) {
m_iconDockLabel->setEnabled(false); m_iconDockLabel->setEnabled(false);
@ -749,8 +749,8 @@ void KNutPrefDlg::initDock () {
} }
else { else {
m_iconDockLabel->setEnabled(true); m_iconDockLabel->setEnabled(true);
m_BGIButton->setEnabled(m_settingData->customKIconColor); m_BGIButton->setEnabled(m_settingData->customTDEIconColor);
m_dockBackgroundColorLabel->setEnabled(m_settingData->customKIconColor); m_dockBackgroundColorLabel->setEnabled(m_settingData->customTDEIconColor);
} }
setTopLayout->addStretch( 20 ); setTopLayout->addStretch( 20 );

6
src/knutprefdlg.h
Unescape View File

@ -82,12 +82,12 @@ enum changePref {
ChangeCustomAPanelOColor = 0x8000, // 32768, ChangeCustomAPanelOColor = 0x8000, // 32768,
ChangeAPOColor = 0x10000, // 65536, ChangeAPOColor = 0x10000, // 65536,
ChangeCustomKIconColor = 0x20000, // 131072, ChangeCustomTDEIconColor = 0x20000, // 131072,
ChangeKIconBColor = 0x40000, // 262144, ChangeTDEIconBColor = 0x40000, // 262144,
ChangeToolTip = 0x80000, // 524288, ChangeToolTip = 0x80000, // 524288,
ChangeTypeOfKIcon = 0x100000, // 1048576 ChangeTypeOfTDEIcon = 0x100000, // 1048576
ChangeTypeOfDigProcessing = 0x200000, // 1048576 *2 ChangeTypeOfDigProcessing = 0x200000, // 1048576 *2

4
src/knutprintupsvar.cpp
Unescape View File

@ -63,8 +63,8 @@ KNutPrintUpsVar::KNutPrintUpsVar(KNutNet* const upsNet, const bool useDescriptio
countRWVars=myUpsNet->readNumberVars(KNutNet::RWVars); countRWVars=myUpsNet->readNumberVars(KNutNet::RWVars);
countIComms=myUpsNet->readNumberComms(); countIComms=myUpsNet->readNumberComms();
KIconLoader *loader = TDEGlobal::iconLoader(); TDEIconLoader *loader = TDEGlobal::iconLoader();
dirPixmap=loader->loadIcon ("folder_open",KIcon::Small,16); dirPixmap=loader->loadIcon ("folder_open",TDEIcon::Small,16);
page = plainPage(); page = plainPage();
TQHBoxLayout* upsVarsMainLayout = new TQHBoxLayout(page); TQHBoxLayout* upsVarsMainLayout = new TQHBoxLayout(page);

4
src/knutvardata.h
Unescape View File

@ -120,9 +120,9 @@ struct SettingDataDef {
bool customFont; // use custom font bool customFont; // use custom font
bool useDescription; bool useDescription;
unsigned int toolTipFlags; unsigned int toolTipFlags;
bool customKIconColor; bool customTDEIconColor;
TQColor kIconBackgroundColor; TQColor kIconBackgroundColor;
int typeOfKIcon; int typeOfTDEIcon;
int typeDigitalProcessing; int typeDigitalProcessing;
bool activatedMainWindow; bool activatedMainWindow;
}; };

Write Preview
Loading…
Cancel
Save