← Back to branch summary

~ubuntu-branches/debian/stretch/psi-plus/stretch

« back to all changes in this revision

Viewing changes to src/patches/mac/3000-brushed-metal.diff

  • Committer: Package Import Robot
  • Author(s): Boris Pek
  • Date: 2013-10-23 02:42:20 UTC
  • mfrom: (1.4.7)
  • Revision ID: package-import@ubuntu.com-20131023024220-bk2hyoenqkwfhpgw
Tags: 0.16.242-1
http://bugs.debian.org/724880
* New upstream release:
  fixed the problem of initialization of private conversation when both
  sides use libotr 4.0.x. (Closes: #724880)
* Update debian/watch: sources were moved.
* Delete psi-plus-content-downloader package and update all related files.
  This plugin is in psi-plus-plugins package now.
* Update debian/control:
  - remove all currently unneeded Replaces and Breaks fields
  - add build dependency on libidn11-dev
* Update debian/rules: simplify get-orig-source section.
* Update debian/copyright:
  - update Source field due to changes in sources location
  - remove copyright holders whose code was deleted from source tree
    (bundled libidn library was removed)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/patches/mac/3000-brushed-metal.diff
8
8
+                       setAttribute(Qt::WA_MacMetalStyle);
9
9
+
10
10
+       }
11
 
+       
 
11
+
12
12
        pending_ = 0;
13
13
        keepOpen_ = false;
14
14
        warnSend_ = false;
28
28
 {
29
29
        setAttribute(Qt::WA_DeleteOnClose);
30
30
+       if ( PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool() )
31
 
+                       setAttribute(Qt::WA_MacMetalStyle);     
 
31
+                       setAttribute(Qt::WA_MacMetalStyle);
32
32
        d = new Private(this);
33
33
        d->composing = true;
34
34
        d->psi = psi;
58
58
@@ -149,6 +149,11 @@ TabDlg::TabDlg(TabManager* tabManager, c
59
59
                delegate_->create(this);
60
60
        }
61
 
 
 
61
 
62
62
+       if (PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool()) {
63
63
+                       setAttribute(Qt::WA_MacMetalStyle);
64
 
+               
 
64
+
65
65
+       }
66
 
+       
 
66
+
67
67
        // FIXME
68
68
        qRegisterMetaType<TabDlg*>("TabDlg*");
69
69
        qRegisterMetaType<TabbableWidget*>("TabbableWidget*");
71
71
+++ psi/src/whiteboarding/wbdlg.cpp
72
72
@@ -41,6 +41,9 @@ static const QString geometryOption = "o
73
73
 //----------------------------------------------------------------------------
74
 
 
 
74
 
75
75
 WbDlg::WbDlg(SxeSession* session, PsiAccount* pa) {
76
76
+       if ( PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool() )
77
77
+               setAttribute(Qt::WA_MacMetalStyle);
78
 
+       
 
78
+
79
79
        groupChat_ = session->groupChat();
80
80
        pending_ = 0;
81
81
        keepOpen_ = false;