Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 269110 | Differences between
and this patch

Collapse All | Expand All

(-)a/cr3qt/src/mainwindow.cpp (-4 / +8 lines)
Lines 77-84 MainWindow::MainWindow(QWidget *parent) Link Here
77
#endif
77
#endif
78
    QString cacheDir = homeDir + "cache";
78
    QString cacheDir = homeDir + "cache";
79
    QString bookmarksDir = homeDir + "bookmarks";
79
    QString bookmarksDir = homeDir + "bookmarks";
80
    QString histFile = exeDir + "cr3hist.bmk";
80
    QString histFile2 = exeDir + "cr3hist.bmk";
81
    QString histFile2 = homeDir + "cr3hist.bmk";
81
    QString histFile = homeDir + "cr3hist.bmk";
82
    QString iniFile2 = exeDir + "cr3.ini";
82
    QString iniFile2 = exeDir + "cr3.ini";
83
    QString iniFile = homeDir + "cr3.ini";
83
    QString iniFile = homeDir + "cr3.ini";
84
    QString cssFile = homeDir + "fb2.css";
84
    QString cssFile = homeDir + "fb2.css";
Lines 92-100 MainWindow::MainWindow(QWidget *parent) Link Here
92
    ldomDocCache::init( qt2cr( cacheDir ), DOC_CACHE_SIZE );
92
    ldomDocCache::init( qt2cr( cacheDir ), DOC_CACHE_SIZE );
93
    ui->view->setPropsChangeCallback( this );
93
    ui->view->setPropsChangeCallback( this );
94
    if ( !ui->view->loadSettings( iniFile ) )
94
    if ( !ui->view->loadSettings( iniFile ) )
95
        ui->view->loadSettings( iniFile2 );
95
        if ( !ui->view->loadSettings( iniFile2 ) )
96
          ui->view->saveSettings( iniFile );
97
96
    if ( !ui->view->loadHistory( histFile ) )
98
    if ( !ui->view->loadHistory( histFile ) )
97
        ui->view->loadHistory( histFile2 );
99
        if ( !ui->view->loadHistory( histFile2 ) )
100
          ui->view->saveHistory( histFile );
101
98
    if ( !ui->view->loadCSS( cssFile ) )
102
    if ( !ui->view->loadCSS( cssFile ) )
99
        ui->view->loadCSS( cssFile2 );
103
        ui->view->loadCSS( cssFile2 );
100
#if ENABLE_BOOKMARKS_DIR==1
104
#if ENABLE_BOOKMARKS_DIR==1

Return to bug 269110