summaryrefslogtreecommitdiffstats
path: root/krusader/Panel
diff options
context:
space:
mode:
Diffstat (limited to 'krusader/Panel')
-rw-r--r--krusader/Panel/krbriefview.cpp6
-rw-r--r--krusader/Panel/krcolorcache.cpp24
-rw-r--r--krusader/Panel/krdetailedview.cpp10
-rw-r--r--krusader/Panel/krpopupmenu.cpp4
-rw-r--r--krusader/Panel/krviewitem.cpp2
-rw-r--r--krusader/Panel/listpanel.cpp8
-rwxr-xr-xkrusader/Panel/panelfunc.cpp4
-rw-r--r--krusader/Panel/panelpopup.cpp4
8 files changed, 31 insertions, 31 deletions
diff --git a/krusader/Panel/krbriefview.cpp b/krusader/Panel/krbriefview.cpp
index ae0ca76..256d1aa 100644
--- a/krusader/Panel/krbriefview.cpp
+++ b/krusader/Panel/krbriefview.cpp
@@ -98,7 +98,7 @@ void KrBriefView::setup() {
setFont( _config->readFontEntry( "Filelist Font", _FilelistFont ) );
// decide on single click/double click selection
if ( _config->readBoolEntry( "Single Click Selects", _SingleClickSelects ) &&
- KGlobalSettings::singleClick() ) {
+ TDEGlobalSettings::singleClick() ) {
connect( this, TQT_SIGNAL( executed( TQIconViewItem* ) ), this, TQT_SLOT( slotExecuted( TQIconViewItem* ) ) );
} else {
connect( this, TQT_SIGNAL( clicked( TQIconViewItem* ) ), this, TQT_SLOT( slotClicked( TQIconViewItem* ) ) );
@@ -341,7 +341,7 @@ void KrBriefView::slotClicked( TQIconViewItem *item ) {
if ( !modifierPressed ) {
if ( singleClicked && !renameTimer.isActive() ) {
- KConfig * config = KGlobal::config();
+ KConfig * config = TDEGlobal::config();
config->setGroup( "KDE" );
int doubleClickInterval = config->readNumEntry( "DoubleClickInterval", 400 );
@@ -1237,7 +1237,7 @@ void KrBriefView::refreshColors() {
setPaletteBackgroundColor( cg.background() );
} else {
// KDE default is choosen: set back the background color
- setPaletteBackgroundColor( KGlobalSettings::baseColor() );
+ setPaletteBackgroundColor( TDEGlobalSettings::baseColor() );
}
slotUpdate();
}
diff --git a/krusader/Panel/krcolorcache.cpp b/krusader/Panel/krcolorcache.cpp
index 4384b8a..27468ea 100644
--- a/krusader/Panel/krcolorcache.cpp
+++ b/krusader/Panel/krcolorcache.cpp
@@ -400,16 +400,16 @@ TQColorGroup KrColorCacheImpl::getColors(const KrColorItemType & type) const
TQColorGroup result;
if (m_colorSettings.getBoolValue("KDE Default", _KDEDefaultColors))
{
- // KDE default? Getcolors from KGlobalSettings.
+ // KDE default? Getcolors from TDEGlobalSettings.
bool enableAlternateBackground = m_colorSettings.getBoolValue("Enable Alternate Background", _AlternateBackground);
TQColor background = enableAlternateBackground && type.m_alternateBackgroundColor ?
- KGlobalSettings::alternateBackgroundColor()
- : KGlobalSettings::baseColor();
+ TDEGlobalSettings::alternateBackgroundColor()
+ : TDEGlobalSettings::baseColor();
result.setColor(TQColorGroup::Base, background);
result.setColor(TQColorGroup::Background, background);
- result.setColor(TQColorGroup::Text, KGlobalSettings::textColor());
- result.setColor(TQColorGroup::HighlightedText, KGlobalSettings::highlightedTextColor());
- result.setColor(TQColorGroup::Highlight, KGlobalSettings::highlightColor());
+ result.setColor(TQColorGroup::Text, TDEGlobalSettings::textColor());
+ result.setColor(TQColorGroup::HighlightedText, TDEGlobalSettings::highlightedTextColor());
+ result.setColor(TQColorGroup::Highlight, TDEGlobalSettings::highlightColor());
return result;
}
bool markCurrentAlways = m_colorSettings.getBoolValue("Show Current Item Always", _ShowCurrentItemAlways);
@@ -526,7 +526,7 @@ const TQColor & KrColorCacheImpl::setColorIfContrastIsSufficient(const TQColor &
TQColor KrColorCacheImpl::getForegroundColor(bool isActive) const
{
- TQColor color = KGlobalSettings::textColor();
+ TQColor color = TDEGlobalSettings::textColor();
SETCOLOR(color, m_colorSettings.getColorValue("Foreground"));
if (!isActive) SETCOLOR(color, m_colorSettings.getColorValue("Inactive Foreground"));
return color;
@@ -546,7 +546,7 @@ TQColor KrColorCacheImpl::getSpecialForegroundColor(const TQString & type, bool
TQColor KrColorCacheImpl::getBackgroundColor(bool isActive) const
{
- TQColor color = KGlobalSettings::baseColor();
+ TQColor color = TDEGlobalSettings::baseColor();
SETCOLOR(color, m_colorSettings.getColorValue("Background"));
if (!isActive) SETCOLOR(color, m_colorSettings.getColorValue("Inactive Background"));
return color;
@@ -564,9 +564,9 @@ TQColor KrColorCacheImpl::getAlternateBackgroundColor(bool isActive) const
m_colorSettings.getColorValue("Alternate Background")
: m_colorSettings.getColorValue("Inactive Alternate Background");
if (!color.isValid())
- color = KGlobalSettings::alternateBackgroundColor();
+ color = TDEGlobalSettings::alternateBackgroundColor();
if (!color.isValid())
- color = KGlobalSettings::baseColor();
+ color = TDEGlobalSettings::baseColor();
return color;
}
@@ -576,7 +576,7 @@ TQColor KrColorCacheImpl::getMarkedForegroundColor(bool isActive) const
if (m_colorSettings.getColorTextValue(colorName) == "transparent")
return TQColor();
if (isActive && m_colorSettings.getColorTextValue(colorName) == "")
- return KGlobalSettings::highlightedTextColor();
+ return TDEGlobalSettings::highlightedTextColor();
if (!isActive && m_colorSettings.getColorTextValue(colorName) == "")
return getMarkedForegroundColor(true);
return m_colorSettings.getColorValue(colorName);
@@ -585,7 +585,7 @@ TQColor KrColorCacheImpl::getMarkedForegroundColor(bool isActive) const
TQColor KrColorCacheImpl::getMarkedBackgroundColor(bool isActive) const
{
if (isActive && m_colorSettings.getColorTextValue("Marked Background") == "")
- return KGlobalSettings::highlightColor();
+ return TDEGlobalSettings::highlightColor();
if (isActive && m_colorSettings.getColorTextValue("Marked Background") == "Background")
return getBackgroundColor(true);
if (!isActive && m_colorSettings.getColorTextValue("Inactive Marked Background") == "")
diff --git a/krusader/Panel/krdetailedview.cpp b/krusader/Panel/krdetailedview.cpp
index b89feab..708970d 100644
--- a/krusader/Panel/krdetailedview.cpp
+++ b/krusader/Panel/krdetailedview.cpp
@@ -117,7 +117,7 @@ void KrDetailedView::setup() {
setFont( _config->readFontEntry( "Filelist Font", _FilelistFont ) );
// decide on single click/double click selection
if ( _config->readBoolEntry( "Single Click Selects", _SingleClickSelects ) &&
- KGlobalSettings::singleClick() ) {
+ TDEGlobalSettings::singleClick() ) {
connect( this, TQT_SIGNAL( executed( TQListViewItem* ) ), this, TQT_SLOT( slotExecuted( TQListViewItem* ) ) );
} else {
connect( this, TQT_SIGNAL( clicked( TQListViewItem* ) ), this, TQT_SLOT( slotClicked( TQListViewItem* ) ) );
@@ -163,7 +163,7 @@ void KrDetailedView::setup() {
newColumn( KrDetailedViewProperties::DateTime );
setColumnWidthMode( COLUMN(DateTime), TQListView::Manual );
//setColumnWidth( column( DateTime ), TQFontMetrics( font() ).width( "99/99/99 99:99" ) );
- setColumnWidth( COLUMN(DateTime), TQFontMetrics( font() ).width( KGlobal::locale() ->formatDateTime(
+ setColumnWidth( COLUMN(DateTime), TQFontMetrics( font() ).width( TDEGlobal::locale() ->formatDateTime(
TQDateTime ( TQDate( 2099, 12, 29 ), TQTime( 23, 59 ) ) ) ) + 3 );
}
if ( _config->readBoolEntry( "Perm Column", _PermColumn ) ) {
@@ -431,7 +431,7 @@ void KrDetailedView::slotClicked( TQListViewItem *item ) {
if ( !modifierPressed ) {
if ( singleClicked && !renameTimer.isActive() ) {
- KConfig * config = KGlobal::config();
+ KConfig * config = TDEGlobal::config();
config->setGroup( "KDE" );
int doubleClickInterval = config->readNumEntry( "DoubleClickInterval", 400 );
@@ -1333,9 +1333,9 @@ void KrDetailedView::refreshColors() {
setAlternateBackground( cg.background() );
} else {
// KDE default is choosen: set back the background color
- setPaletteBackgroundColor( KGlobalSettings::baseColor() );
+ setPaletteBackgroundColor( TDEGlobalSettings::baseColor() );
// Set the alternate color to its default or to an invalid color, to turn alternate the background off.
- setAlternateBackground( alternateBackgroundEnabled ? KGlobalSettings::alternateBackgroundColor() : TQColor() );
+ setAlternateBackground( alternateBackgroundEnabled ? TDEGlobalSettings::alternateBackgroundColor() : TQColor() );
}
}
diff --git a/krusader/Panel/krpopupmenu.cpp b/krusader/Panel/krpopupmenu.cpp
index 4cdd883..2782bc4 100644
--- a/krusader/Panel/krpopupmenu.cpp
+++ b/krusader/Panel/krpopupmenu.cpp
@@ -324,7 +324,7 @@ void KrPopupMenu::performAction(int id) {
case OPEN_TERM_ID :
TQString save = getcwd( 0, 0 );
chdir( panel->func->files() ->vfs_getFile( item->name() ).path( -1 ).local8Bit() );
- KProcess proc;
+ TDEProcess proc;
{
KConfigGroupSaver saver(krConfig, "General");
TQString term = krConfig->readEntry( "Terminal", _Terminal );
@@ -335,7 +335,7 @@ void KrPopupMenu::performAction(int id) {
proc << "&";
proc.setUseShell( true );
}
- if ( !proc.start( KProcess::DontCare ) )
+ if ( !proc.start( TDEProcess::DontCare ) )
KMessageBox::sorry( krApp, i18n( "Can't open \"%1\"" ).arg(term) );
} // group-saver is blown out of scope here
chdir( save.local8Bit() );
diff --git a/krusader/Panel/krviewitem.cpp b/krusader/Panel/krviewitem.cpp
index 96e9a02..28f3a0c 100644
--- a/krusader/Panel/krviewitem.cpp
+++ b/krusader/Panel/krviewitem.cpp
@@ -85,7 +85,7 @@ TQString KrViewItem::dateTime() const {
struct tm* t=localtime((time_t *)&time);
TQDateTime tmp(TQDate(t->tm_year+1900, t->tm_mon+1, t->tm_mday), TQTime(t->tm_hour, t->tm_min));
- return KGlobal::locale()->formatDateTime(tmp);
+ return TDEGlobal::locale()->formatDateTime(tmp);
}
TQPixmap KrViewItem::icon() {
diff --git a/krusader/Panel/listpanel.cpp b/krusader/Panel/listpanel.cpp
index 48c6904..097e26c 100644
--- a/krusader/Panel/listpanel.cpp
+++ b/krusader/Panel/listpanel.cpp
@@ -594,8 +594,8 @@ void ListPanel::slotFocusOnMe() {
// take care of the 'otherpanel'
TQPalette q( otherPanel->status->palette() );
- q.setColor( TQColorGroup::Foreground, KGlobalSettings::textColor() );
- q.setColor( TQColorGroup::Background, KGlobalSettings::baseColor() );
+ q.setColor( TQColorGroup::Foreground, TDEGlobalSettings::textColor() );
+ q.setColor( TQColorGroup::Background, TDEGlobalSettings::baseColor() );
otherPanel->status->setPalette( q );
otherPanel->totals->setPalette( q );
@@ -603,8 +603,8 @@ void ListPanel::slotFocusOnMe() {
// now, take care of this panel
TQPalette p( status->palette() );
- p.setColor( TQColorGroup::Foreground, KGlobalSettings::highlightedTextColor() );
- p.setColor( TQColorGroup::Background, KGlobalSettings::highlightColor() );
+ p.setColor( TQColorGroup::Foreground, TDEGlobalSettings::highlightedTextColor() );
+ p.setColor( TQColorGroup::Background, TDEGlobalSettings::highlightColor() );
status->setPalette( p );
totals->setPalette( p );
diff --git a/krusader/Panel/panelfunc.cpp b/krusader/Panel/panelfunc.cpp
index c1fb987..89e5685 100755
--- a/krusader/Panel/panelfunc.cpp
+++ b/krusader/Panel/panelfunc.cpp
@@ -365,7 +365,7 @@ void ListPanelFunc::terminal() {
TQString save = getcwd( 0, 0 );
chdir( panel->realPath().local8Bit() );
- KProcess proc;
+ TDEProcess proc;
krConfig->setGroup( "General" );
TQString term = krConfig->readEntry( "Terminal", _Terminal );
proc << KrServices::separateArgs( term );
@@ -376,7 +376,7 @@ void ListPanelFunc::terminal() {
proc.setUseShell( true );
}
- if ( !proc.start( KProcess::DontCare ) )
+ if ( !proc.start( TDEProcess::DontCare ) )
KMessageBox::sorry( krApp, i18n( "<qt>Can't open <b>%1</b></qt>" ).arg(term) );
chdir( save.local8Bit() );
diff --git a/krusader/Panel/panelpopup.cpp b/krusader/Panel/panelpopup.cpp
index 6ae2810..6027d86 100644
--- a/krusader/Panel/panelpopup.cpp
+++ b/krusader/Panel/panelpopup.cpp
@@ -49,8 +49,8 @@ PanelPopup::PanelPopup( TQSplitter *parent, bool left ) : TQWidget( parent ),
// --- hack: setup colors to be the same as an inactive panel
dataLine->setBackgroundMode( PaletteBackground );
TQPalette q( dataLine->palette() );
- q.setColor( TQColorGroup::Foreground, KGlobalSettings::textColor() );
- q.setColor( TQColorGroup::Background, KGlobalSettings::baseColor() );
+ q.setColor( TQColorGroup::Foreground, TDEGlobalSettings::textColor() );
+ q.setColor( TQColorGroup::Background, TDEGlobalSettings::baseColor() );
dataLine->setPalette( q );
dataLine->setFrameStyle( TQFrame::Box | TQFrame::Raised );
dataLine->setLineWidth( 1 ); // a nice 3D touch :-)