← Back to branch summary

~ubuntu-branches/ubuntu/precise/kdeadmin/precise

« back to all changes in this revision

Viewing changes to system-config-printer-kde/system-config-printer-kde.py

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi, Alessandro Ghersi, Jonathan Riddell
  • Date: 2010-10-17 06:47:21 UTC
  • mfrom: (1.2.50 upstream)
  • Revision ID: james.westby@ubuntu.com-20101017064721-1gc4g44trays84gg
Tags: 4:4.5.2-0ubuntu1
[ Alessandro Ghersi ]
* Merge with Debian git remaining changes:
  - debian/control:
    - Don't ship knetworkconf, it is utterly busted
    - kdeadmin doesn't depend on knetworkconf
    - kde-config-cron conflicts/replaces on kcron (<< 4:4.4.60)
    - system-config-printer-kde depends on system-printer-common
    - system-config-printer-kde doesn't depend on python-cupsutils
    - kdeadmin-dbg depends on kdeadmin
  - debian/patches:
    - Remove 01_system_config_printer_kde_cupsutils.diff, it's only
      relevant for Debian not Ubuntu

[ Jonathan Riddell ]
* New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
system-config-printer-kde/system-config-printer-kde.py
382
382
        self.ui.lblPOptions.hide()
383
383
        self.ui.lblPInstallOptions.hide()
384
384
 
 
385
        # Enforce minimumSize of Job Options scroll area viewport in
 
386
        # order for the scroll area widget to fit horizontally
 
387
        self.ui.scrollArea.viewport().setMinimumSize( \
 
388
          self.ui.scrollArea.widget().minimumSizeHint().width(), 0)
 
389
 
385
390
        return self.ui
386
391
 
387
392
    # now called  dests_iconview_item_activated() in the Gnome version
1333
1338
        self.swPInstallOptions.show_all()
1334
1339
        self.swPOptions.show_all()
1335
1340
        """
 
1341
        self.ui.optionsPageScrollArea.viewport().setMinimumSize( \
 
1342
          self.ui.optionsPageScrollArea.widget().minimumSizeHint().width(), 0)
1336
1343
 
1337
1344
 
1338
1345
    # Class members
1878
1885
            else:
1879
1886
                msg = i18nc("HTTP error", "status %1", status)
1880
1887
 
1881
 
        KMessageBox.error(self, i18n("There was an HTTP error: %1.", msg), i18n('CUPS server error'))
 
1888
            KMessageBox.error(self, i18n("There was an HTTP error: %1.", msg), i18n('CUPS server error'))
1882
1889
 
1883
1890
    def getSelectedItem(self):
1884
1891
        return unicode(self.mainListSelectedName), unicode(self.mainListSelectedType)