← Back to branch summary

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

« back to all changes in this revision

Viewing changes to scribus/patterndialog.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/patterndialog.cpp
84
84
                QString newName = "";
85
85
                Query dia(this, "tt", 1, 0, tr("&Name:"), tr("Rename Entry"));
86
86
                dia.setEditText(it->text(), true);
 
87
                dia.setTestList(dialogPatterns.keys());
87
88
                if (dia.exec())
88
89
                {
89
90
                        newName = dia.getEditText();
90
 
                        while (dialogPatterns.contains(newName))
91
 
                        {
92
 
                                if (!dia.exec())
93
 
                                        return;
94
 
                                newName = dia.getEditText();
95
 
                        }
96
91
                        ScPattern pat = dialogPatterns.take(it->text());
97
92
                        dialogPatterns.insert(newName, pat);
98
93
                        replaceMap.insert(patternName, newName);
169
164
                        {
170
165
                                mainWin->mainWindowProgressBar->setValue(dc);
171
166
                                qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
172
 
                                QFileInfo fi(QDir::cleanPath(QDir::convertSeparators(fileName + "/" + d[dc])));
 
167
                                QFileInfo fi(QDir::cleanPath(QDir::toNativeSeparators(fileName + "/" + d[dc])));
173
168
                                QString ext = fi.suffix().toLower();
174
169
                                if ((ext == "sml") || (ext == "shape") || (ext == "sce") || (!formats.contains(ext)))
175
 
                                        loadVectors(QDir::cleanPath(QDir::convertSeparators(fileName + "/" + d[dc])));
 
170
                                        loadVectors(QDir::cleanPath(QDir::toNativeSeparators(fileName + "/" + d[dc])));
176
171
                        }
177
172
                        for (uint dc = 0; dc < d.count(); ++dc)
178
173
                        {
179
174
                                mainWin->mainWindowProgressBar->setValue(d.count() + dc);
180
175
                                qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
181
 
                                QFileInfo fi(QDir::cleanPath(QDir::convertSeparators(fileName + "/" + d[dc])));
 
176
                                QFileInfo fi(QDir::cleanPath(QDir::toNativeSeparators(fileName + "/" + d[dc])));
182
177
                                QString ext = fi.suffix().toLower();
183
178
                                if ((ext == "sml") || (ext == "shape") || (ext == "sce") || (!formats.contains(ext)))
184
179
                                        continue;
189
184
                                        {
190
185
                                                ScPattern pat = ScPattern();
191
186
                                                pat.setDoc(m_doc);
192
 
                                                pat.setPattern(QDir::cleanPath(QDir::convertSeparators(fileName + "/" + d[dc])));
 
187
                                                pat.setPattern(QDir::cleanPath(QDir::toNativeSeparators(fileName + "/" + d[dc])));
193
188
                                                dialogPatterns.insert(patNam, pat);
194
189
                                                origNames.insert(patNam, patNam);
195
190
                                        }