← Back to branch summary

~ubuntu-branches/ubuntu/edgy/digikam/edgy-proposed

« back to all changes in this revision

Viewing changes to digikam/digikam/digikamapp.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Achim Bohnet
  • Date: 2006-05-15 01:15:02 UTC
  • mfrom: (1.2.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20060515011502-kpyuz7766hpbuia8
Tags: 0.8.2~rc1-0ubuntu1
* sync with debian (UVF see #44102)
  0.8.2~rc1-0ubuntu1 is identical to debian's 0.8.1+0.8.2-rc1-1.
  Version was changed due to latest 0.8.1.ubuntu-0ubuntu1 upload.
  This version is unfortunately bigger than debian's 0.8.1+0.8.2-rc1-1
* Merge in ubuntu changelog

Show diffs side-by-side

added added

removed removed

Lines of Context:
digikam/digikam/digikamapp.cpp
82
82
#include "splashscreen.h"
83
83
#include "thumbnailsize.h"
84
84
#include "scanlib.h"
 
85
#include "dcrawbinary.h"
85
86
 
86
87
DigikamApp::DigikamApp()
87
88
          : KMainWindow( 0, "Digikam" )
155
156
    delete mAlbumManager;
156
157
    delete AlbumLister::instance();
157
158
 
 
159
    Digikam::DcrawBinary::cleanUp();
 
160
 
158
161
    m_instance = 0;
159
162
}
160
163
 
588
591
                                   actionCollection(),
589
592
                                   "gamma_adjustment");
590
593
 
 
594
    // -- Rating actions ---------------------------------------------------------------
 
595
 
 
596
    m_0Star = new KAction(i18n("No Star"), CTRL+Key_0,
 
597
                          mView, SLOT(slotAssignRatingNoStar()),
 
598
                          actionCollection(), "imageview_ratenostar");
 
599
    m_1Star = new KAction(i18n("One Star"), CTRL+Key_1,
 
600
                          mView, SLOT(slotAssignRatingOneStar()),
 
601
                          actionCollection(), "imageview_rateonestar");
 
602
    m_2Star = new KAction(i18n("Two Star"), CTRL+Key_2, 
 
603
                          mView, SLOT(slotAssignRatingTwoStar()),
 
604
                          actionCollection(), "imageview_ratetwostar");
 
605
    m_3Star = new KAction(i18n("Three Star"), CTRL+Key_3, 
 
606
                          mView, SLOT(slotAssignRatingThreeStar()),
 
607
                          actionCollection(), "imageview_ratethreestar");
 
608
    m_4Star = new KAction(i18n("Four Star"), CTRL+Key_4, 
 
609
                          mView, SLOT(slotAssignRatingFourStar()),
 
610
                          actionCollection(), "imageview_ratefourstar");
 
611
    m_5Star = new KAction(i18n("Five Star"), CTRL+Key_5, 
 
612
                          mView, SLOT(slotAssignRatingFiveStar()),
 
613
                          actionCollection(), "imageview_ratefivestar");
 
614
                          
591
615
    // -----------------------------------------------------------
592
616
 
593
617
    KAction* findAction = KStdAction::find(mView, SLOT(slotNewQuickSearch()),
923
947
 
924
948
    // Fetch the contents of the device. This is needed to make sure that the 
925
949
    // media:/device gets mounted.
926
 
    KIO::ListJob *job = KIO::listDir(KURL(mCameraGuiPath), false, false);
927
 
    KIO::NetAccess::synchronousRun(job,0);
 
950
    // KIO::ListJob *job = KIO::listDir(KURL(mCameraGuiPath), false, false);
 
951
    //
 
952
    // cant use this, as this is not in old kdelibs
 
953
    // KIO::NetAccess::synchronousRun(job,0);
928
954
 
929
955
    QString cameraGuiPath = convertToLocalUrl(mCameraGuiPath);
930
956
    kdDebug() << "IN: " << mCameraGuiPath << " OUT: " << cameraGuiPath << endl;
974
1000
            // Ok, item is now mounted and not before, umount it.
975
1001
            kdDebug() << "Trying to umount device" << endl;
976
1002
            KIO::SimpleJob *job = KIO::unmount(convertToLocalUrl(mCameraGuiPath));
977
 
            KIO::NetAccess::synchronousRun(job,0);
 
1003
            // cant use this, as this is not in old kdelibs
 
1004
            // KIO::NetAccess::synchronousRun(job,0);
978
1005
        }
979
1006
    }
980
1007
}
1338
1365
 
1339
1366
void DigikamApp::populateThemes()
1340
1367
{
1341
 
    ThemeEngine::instance()->scanThemes();
1342
 
    QStringList themes(ThemeEngine::instance()->themeNames());
 
1368
    Digikam::ThemeEngine::instance()->scanThemes();
 
1369
    QStringList themes(Digikam::ThemeEngine::instance()->themeNames());
1343
1370
 
1344
1371
    mThemeMenuAction->setItems(themes);
1345
1372
    int index = themes.findIndex(mAlbumSettings->getCurrentTheme());
1346
1373
    if (index == -1)
1347
1374
        index = themes.findIndex(i18n("Default"));
1348
1375
    mThemeMenuAction->setCurrentItem(index);
1349
 
    ThemeEngine::instance()->slotChangeTheme(mThemeMenuAction->currentText());
 
1376
    Digikam::ThemeEngine::instance()->slotChangeTheme(mThemeMenuAction->currentText());
1350
1377
}
1351
1378
 
1352
1379
void DigikamApp::slotChangeTheme(const QString& theme)
1353
1380
{
1354
1381
    mAlbumSettings->setCurrentTheme(theme);
1355
 
    ThemeEngine::instance()->slotChangeTheme(theme);
 
1382
    Digikam::ThemeEngine::instance()->slotChangeTheme(theme);
1356
1383
}
1357
1384
 
1358
1385
void DigikamApp::updateDeleteTrashMenu()