summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--client/config/themes.cpp22
1 files changed, 8 insertions, 14 deletions
diff --git a/client/config/themes.cpp b/client/config/themes.cpp
index f309ba7..625929a 100644
--- a/client/config/themes.cpp
+++ b/client/config/themes.cpp
@@ -372,27 +372,21 @@ void IconThemesConfig::themeSelected( TQListViewItem *item, TQLabel *previewLabe
}
TQString dirNameStr = dirName + item->text( 0 ) + "/deco/" ;
- bool useNewFileNames = topLeftCornerBg.load( dirNameStr + "leftUpperCornerFrameBg.png" );
-
- if ( useNewFileNames )
- {
- leftButtonsBg.load( dirNameStr + "buttonsLeftBg" );
- leftTitleBg.load( dirNameStr + "titleLeftBg.png" );
- midTitleBg.load( dirNameStr + "titleMidBg.png" );
- rightTitleBg.load( dirNameStr + "titleRightBg.png" );
- rightButtonsBg.load( dirNameStr + "buttonsRightBg.png" );
- topRightCornerBg.load( dirNameStr + "rightUpperCornerFrameBg.png" );
- }
- else
- {
+
+ if ( !topLeftCornerBg.load( dirNameStr + "leftUpperCornerFrameBg.png" ) )
topLeftCornerBg.load( dirNameStr + "topLeftCornerBg.png" );
+ if ( !leftButtonsBg.load( dirNameStr + "buttonsLeftBg" ) )
leftButtonsBg.load( dirNameStr + "leftButtonsBg" );
+ if ( !leftTitleBg.load( dirNameStr + "titleLeftBg.png" ) )
leftTitleBg.load( dirNameStr + "leftTitleBg.png" );
+ if ( !midTitleBg.load( dirNameStr + "titleMidBg.png" ) )
midTitleBg.load( dirNameStr + "midTitleBg.png" );
+ if ( !rightTitleBg.load( dirNameStr + "titleRightBg.png" ) )
rightTitleBg.load( dirNameStr + "rightTitleBg.png" );
+ if ( !rightButtonsBg.load( dirNameStr + "buttonsRightBg.png" ) )
rightButtonsBg.load( dirNameStr + "rightButtonsBg.png" );
+ if ( !topRightCornerBg.load( dirNameStr + "rightUpperCornerFrameBg.png" ) )
topRightCornerBg.load( dirNameStr + "topRightCornerBg.png" );
- }
w = topLeftCornerBg.width() + leftButtonsBg.width() + leftTitleBg.width() + midTitleBg.width() + rightTitleBg.width() + rightButtonsBg.width() + topRightCornerBg.width() + 8;
h = midTitleBg.height() + 8;