diff --git a/README b/README index eb9b5c4b105e2f4361edc3523a858baa57f89a1a..1d08b8244e01e58d383ec5959c5a6b5f85cddd2b 100644 --- a/README +++ b/README @@ -37,7 +37,7 @@ Build QGroundControl -------------------- 1) From the terminal go to the `groundcontrol` directory -2) Run `qmake` +2) Run `qmake -spec macx-g++` 3) Run `make -j8` diff --git a/files/styles/style-indoor.css b/files/styles/style-indoor.css index 595fcf8d740203c338d95261b2e7ffc5fadbe24e..f851242455a8cb097dec8dbffdd05bd93c14216d 100644 --- a/files/styles/style-indoor.css +++ b/files/styles/style-indoor.css @@ -178,8 +178,8 @@ QDoubleSpinBox::down-button { } QPushButton { - /*min-height: 20px;*/ - /*max-height: 20px;*/ + min-height: 16px; + max-height: 20px; border: 1px solid #465158; margin: 1px; border-radius: 2px; @@ -202,7 +202,7 @@ QPushButton:pressed { QToolButton { font-weight: bold; - min-height: 20px; + min-height: 16px; /*min-width: 24px;*/ max-height: 20px; border: 1px solid #4A4A4F; diff --git a/src/ui/QGCToolBar.cc b/src/ui/QGCToolBar.cc index 3cf334a5d82c993311c934bfec9224b90a4600c0..bfd4789f93bad2ff22c722cae7c1d9a84fccb0f1 100644 --- a/src/ui/QGCToolBar.cc +++ b/src/ui/QGCToolBar.cc @@ -237,7 +237,7 @@ void QGCToolBar::setPerspectiveChangeActions(const QList &actions) advancedButton->setText(tr("Pro")); advancedButton->setToolTip(tr("Options for advanced users")); advancedButton->setCheckable(true); - advancedButton->setStyleSheet("QPushButton { min-width: 60px; font-weight: bold; text-align: left; color: #222222; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A2A3A4, stop: 1 #B6B7B8); margin-left: 0px; margin-right: 13px; padding-left: 4px; padding-right: 8px; border-radius: 0px; border : 0px solid blue; border-bottom-right-radius: 6px; border-top-right-radius: 6px; border-right: 1px solid #484848; border-top: 1px solid #484848; border-bottom: 1px solid #484848; } QPushButton:checked { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #555555, stop: 1 #787878); color: #DDDDDD; }"); + advancedButton->setStyleSheet("QPushButton { min-height: 20px; max-height: 20px; min-width: 60px; font-weight: bold; text-align: left; color: #222222; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A2A3A4, stop: 1 #B6B7B8); margin-left: 0px; margin-right: 13px; padding-left: 4px; padding-right: 8px; border-radius: 0px; border : 0px solid blue; border-bottom-right-radius: 6px; border-top-right-radius: 6px; border-right: 1px solid #484848; border-top: 1px solid #484848; border-bottom: 1px solid #484848; } QPushButton:checked { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #555555, stop: 1 #787878); color: #DDDDDD; }"); addWidget(advancedButton); group->addButton(advancedButton); } else {