git-svn-id: svn://db.shs.com.ru/libs@435 a8b55f48-bf90-11e4-a774-851b48703e85

qad/blockview/blockeditor.cpp

@@ -20,7 +20,6 @@ BlockEditor::BlockEditor(QWidget *parent) : QWidget(parent), ui(new Ui::BlockEdi
 	ui->blockView->addItem(&block);
 	ui->blockView->viewport()->installEventFilter(this);
 	DrawTools * drawtools = new DrawTools(ui->blockView);
-	drawtools->setAlignCompact(true);
 	connect(drawtools, SIGNAL(itemCreated(QGraphicsItem*)), this, SLOT(addItem(QGraphicsItem*)));
 	drawtools->textEditCombo()->addItems(QStringList() << "%name" << "%value" << "%id");
 	ui->layoutProperties->addWidget(drawtools->propertyWidget());

qad/blockview/drawtools.cpp

@@ -250,7 +250,11 @@ actions_Z_up(this), actions_Z_top(this), actions_Z_down(this), actions_Z_bottom(
 		p.end();
 		ui->comboLineStyle->addItem(QIcon(pix), styles[i]);
 	}
+#ifdef Q_OS_MACOS
+	setAlignCompact(true);
+#else
 	setAlignCompact(false);
+#endif
 	menu_hor.addActions(QList<QAction*>() << ui->actionLeft << ui->actionHCenter << ui->actionRight);
 	menu_ver.addActions(QList<QAction*>() << ui->actionTop << ui->actionVCenter << ui->actionBottom);
 	ui->buttonAlignHor->setMenu(&menu_hor);

qad/blockview/drawtools.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1400</width>
+    <width>1197</width>
-    <height>256</height>
+    <height>268</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -29,7 +29,7 @@
    <item>
     <widget class="QStackedWidget" name="stackedProperties">
      <property name="currentIndex">
-      <number>3</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="pageText">
       <layout class="QHBoxLayout" name="horizontalLayout_6">
@@ -94,7 +94,7 @@
           <string>Edit text ...</string>
          </property>
          <property name="icon">
-          <iconset resource="qad_blockview.qrc">
+          <iconset resource="../application/qad_application.qrc">
            <normaloff>:/icons/document-edit.png</normaloff>:/icons/document-edit.png</iconset>
          </property>
          <property name="toolButtonStyle">
@@ -591,7 +591,7 @@
           <string>Load image ...</string>
          </property>
          <property name="icon">
-          <iconset resource="qad_blockview.qrc">
+          <iconset resource="../application/qad_application.qrc">
            <normaloff>:/icons/document-open.png</normaloff>:/icons/document-open.png</iconset>
          </property>
         </widget>
@@ -680,10 +680,10 @@
    </item>
    <item>
     <widget class="ColorButton" name="colorButtonPen">
-     <property name="useNativeDialog">
+     <property name="useNativeDialog" stdset="0">
       <bool>true</bool>
      </property>
-     <property name="useAlphaChannel">
+     <property name="useAlphaChannel" stdset="0">
       <bool>true</bool>
      </property>
     </widget>
@@ -716,10 +716,10 @@
    </item>
    <item>
     <widget class="ColorButton" name="colorButtonBrush">
-     <property name="useNativeDialog">
+     <property name="useNativeDialog" stdset="0">
       <bool>true</bool>
      </property>
-     <property name="useAlphaChannel">
+     <property name="useAlphaChannel" stdset="0">
       <bool>true</bool>
      </property>
     </widget>
@@ -797,6 +797,7 @@
   </customwidget>
  </customwidgets>
  <resources>
+  <include location="../application/qad_application.qrc"/>
   <include location="qad_blockview.qrc"/>
  </resources>
  <connections/>