← Back to branch summary

~ubuntu-branches/debian/sid/scribus/sid

« back to all changes in this revision

Viewing changes to scribus/tabgeneral.cpp

  • Committer: Package Import Robot
  • Author(s): Oleksandr Moskalenko
  • Date: 2012-02-09 21:50:56 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120209215056-2wrx1ara0jbm7fi5
Tags: 1.4.0.dfsg+r17287-1
http://bugs.debian.org/654703
http://bugs.debian.org/655885
http://bugs.debian.org/630751
* New upstream stable release upload into Debian (Closes: #654703).
* Applied the Ubuntu armel patch.
* Removed non-free color swatches from resources.
* debian/control:
  - Moved icc-profiles from Recommends to Suggests (Closes: #655885).
  - Updated Standards-Version to 3.9.2.
  - Updated extended description per lintian warning.
* debian/rules:
  - Update mailcap (Closes: #630751). A request for mime.types update has
    been sent to the mime-support maintainer.
  - Added build-arch and build-indep targets per lintian warning.
* debian/patches:
  - top_cmakelists.patch - don't copy extra docs and changelogs.
  - scribus_cmakelists.patch - don't copy extra docs and changelogs.
  - scribus_cmakelists.patch - don't install the non-free "doc" dir.
  - profiles_cmakelists.patch - don't install non-free sRGB profile.
* debian/copyright: 
  - Converted to the DEP5 machine readable foramt.
  - Added licenses for free color swatches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scribus/tabgeneral.cpp
79
79
        wheelJumpSpin->setValue( prefsData->Wheelval );
80
80
        spinTimeout->setValue(prefsData->moveTimeout);
81
81
        recentDocs->setValue( prefsData->RecentDCount );
82
 
        Docs->setText(QDir::convertSeparators(prefsData->DocDir));
83
 
        ProPfad->setText(QDir::convertSeparators(prefsData->ProfileDir));
84
 
        ScriptPfad->setText(QDir::convertSeparators(prefsData->ScriptDir));
85
 
        DocumentTemplateDir->setText(QDir::convertSeparators(prefsData->documentTemplatesDir));
 
82
        Docs->setText(QDir::toNativeSeparators(prefsData->DocDir));
 
83
        ProPfad->setText(QDir::toNativeSeparators(prefsData->ProfileDir));
 
84
        ScriptPfad->setText(QDir::toNativeSeparators(prefsData->ScriptDir));
 
85
        DocumentTemplateDir->setText(QDir::toNativeSeparators(prefsData->documentTemplatesDir));
86
86
        startUpDialog->setChecked(prefsData->showStartupDialog);
87
87
        showSplashCheckBox->setChecked( !ScQApp->neverSplashExists() );
88
88
        useSmallWidgetsCheck->setChecked(prefsData->useSmallWidgets);
97
97
{
98
98
        QString s = QFileDialog::getExistingDirectory(this, tr("Choose a Directory"), Docs->text());
99
99
        if (!s.isEmpty())
100
 
                Docs->setText( QDir::convertSeparators(s) );
 
100
                Docs->setText( QDir::toNativeSeparators(s) );
101
101
}
102
102
 
103
103
void TabGeneral::changeProfs()
104
104
{
105
105
        QString s = QFileDialog::getExistingDirectory(this, tr("Choose a Directory"), ProPfad->text());
106
106
        if (!s.isEmpty())
107
 
                ProPfad->setText( QDir::convertSeparators(s) );
 
107
                ProPfad->setText( QDir::toNativeSeparators(s) );
108
108
}
109
109
 
110
110
void TabGeneral::changeScripts()
111
111
{
112
112
        QString s = QFileDialog::getExistingDirectory(this, tr("Choose a Directory"), ScriptPfad->text());
113
113
        if (!s.isEmpty())
114
 
                ScriptPfad->setText( QDir::convertSeparators(s) );
 
114
                ScriptPfad->setText( QDir::toNativeSeparators(s) );
115
115
}
116
116
 
117
117
void TabGeneral::changeDocumentTemplates()
118
118
{
119
119
        QString s = QFileDialog::getExistingDirectory(this, tr("Choose a Directory"), DocumentTemplateDir->text());
120
120
        if (!s.isEmpty())
121
 
                DocumentTemplateDir->setText( QDir::convertSeparators(s) );
 
121
                DocumentTemplateDir->setText( QDir::toNativeSeparators(s) );
122
122
}