← Back to branch summary

~ubuntu-branches/ubuntu/wily/scribus/wily-proposed

« back to all changes in this revision

Viewing changes to scribus/tabexternaltoolswidget.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/tabexternaltoolswidget.cpp
89
89
 
90
90
void TabExternalToolsWidget::restoreDefaults(struct ApplicationPrefs *prefsData)
91
91
{
92
 
        psToolLineEdit->setText(QDir::convertSeparators(prefsData->gs_exe));
 
92
        psToolLineEdit->setText(QDir::toNativeSeparators(prefsData->gs_exe));
93
93
        psAntialiasTextCheckBox->setChecked(prefsData->gs_AntiAliasText);
94
94
        psAntialiasGraphicsCheckBox->setChecked(prefsData->gs_AntiAliasGraphics);
95
95
        psResolutionSpinBox->setValue(prefsData->gs_Resolution);
96
 
        imageToolLineEdit->setText(QDir::convertSeparators(prefsData->imageEditorExecutable));
97
 
        extBrowserToolLineEdit->setText(QDir::convertSeparators(prefsData->extBrowserExecutable));
 
96
        imageToolLineEdit->setText(QDir::toNativeSeparators(prefsData->imageEditorExecutable));
 
97
        extBrowserToolLineEdit->setText(QDir::toNativeSeparators(prefsData->extBrowserExecutable));
98
98
        latexResolutionSpinBox->setValue(prefsData->latexResolution);
99
99
        latexEditorLineEdit->setText(prefsData->latexEditorExecutable);
100
100
        latexForceDpiCheckBox->setCheckState(prefsData->latexForceDpi?Qt::Checked:Qt::Unchecked);
113
113
        QFileInfo fi(psToolLineEdit->text());
114
114
        QString s = QFileDialog::getOpenFileName(this, tr("Locate Ghostscript"), fi.path());
115
115
        if (!s.isEmpty())
116
 
                psToolLineEdit->setText( QDir::convertSeparators(s) );
 
116
                psToolLineEdit->setText( QDir::toNativeSeparators(s) );
117
117
}
118
118
 
119
119
void TabExternalToolsWidget::changeImageTool()
121
121
        QFileInfo fi(imageToolLineEdit->text());
122
122
        QString s = QFileDialog::getOpenFileName(this, tr("Locate your image editor"), fi.path());
123
123
        if (!s.isEmpty())
124
 
                imageToolLineEdit->setText( QDir::convertSeparators(s) );
 
124
                imageToolLineEdit->setText( QDir::toNativeSeparators(s) );
125
125
}
126
126
 
127
127
void TabExternalToolsWidget::changeExtBrowserTool()
129
129
        QFileInfo fi(extBrowserToolLineEdit->text());
130
130
        QString s = QFileDialog::getOpenFileName(this, tr("Locate your web browser"), fi.path());
131
131
        if (!s.isEmpty())
132
 
                extBrowserToolLineEdit->setText( QDir::convertSeparators(s) );
 
132
                extBrowserToolLineEdit->setText( QDir::toNativeSeparators(s) );
133
133
}
134
134
 
135
135
void TabExternalToolsWidget::changeLatexEditor()
137
137
        QFileInfo fi(latexEditorLineEdit->text());
138
138
        QString s = QFileDialog::getOpenFileName(this, tr("Locate your editor"), fi.path());
139
139
        if (!s.isEmpty()) {
140
 
                s = QDir::convertSeparators(s);
 
140
                s = QDir::toNativeSeparators(s);
141
141
                if (s.contains(' ') && !s.contains('"'))
142
142
                        s = QString("\"%1\"").arg(s);
143
143
                latexEditorLineEdit->setText(s);
237
237
        if (!fileInPath(psToolLineEdit->text()))
238
238
        {
239
239
                QString gsDef = getGSDefaultExeName();
240
 
                psToolLineEdit->setText( QDir::convertSeparators(gsDef) );
 
240
                psToolLineEdit->setText( QDir::toNativeSeparators(gsDef) );
241
241
        }
242
242
        
243
243
        if (!fileInPath(imageToolLineEdit->text()))