프로젝트

일반

사용자정보

개정판 70c38c27

ID70c38c27776cbcb1713c637b4d5751f066e3bed9
상위 1d0e0e1c
하위 a4f550f5

백흠경이(가) 약 4년 전에 추가함

글자 굵기 옵션 적용

Change-Id: I3c476bcfba639958dbf90ae8cae4cfee048f0106

차이점 보기:

HYTOS/HYTOS/OptionsDialog.py
117 117
                self._callout_text_color = configs[0].value
118 118
                self.ui.pushButtonCalloutTextColor.setStyleSheet('background-color:{}'.format(configs[0].value))
119 119

  
120
            configs = app_doc_data.getAppConfigs('option', 'TagBold')
121
            if configs and len(configs) == 1:
122
                self.ui.checkBoxTextBold.setChecked(configs[0].value == '1')
123

  
124
            configs = app_doc_data.getAppConfigs('option', 'CalloutBold')
125
            if configs and len(configs) == 1:
126
                self.ui.checkBoxCalloutBold.setChecked(configs[0].value == '1')
127

  
120 128
            configs = app_doc_data.getAppConfigs('option', 'WorkSpace')
121 129
            if configs and len(configs) == 1:
122 130
                self.ui.lineEdit_WorkSpace.setText(configs[0].value)
......
128 136
            from App import App
129 137
            from AppDocData import MessageType
130 138

  
131
            message = 'error occurred({ex}) in {sys.exc_info()[-1].tb_frame.f_code.co_filename}:' \
132
                      '{sys.exc_info()[-1].tb_lineno}'
139
            message = f'error occurred({ex}) in {sys.exc_info()[-1].tb_frame.f_code.co_filename}:' \
140
                      f'{sys.exc_info()[-1].tb_lineno}'
133 141
            App.mainWnd().addMessage.emit(MessageType.Error, message)
134 142

  
135 143
    def accept(self):
......
142 150
            self._tag_text_color = self.ui.pushButton_TagFontColor.palette().color(QPalette.Background).name()
143 151
            self._callout_font_size = self.ui.comboBoxCalloutFontSize.currentText()
144 152
            self._callout_text_color = self.ui.pushButtonCalloutTextColor.palette().color(QPalette.Background).name()
153
            text_checked = self.ui.checkBoxTextBold.isChecked()
154
            callout_checked = self.ui.checkBoxCalloutBold.isChecked()
155

  
145 156
            configs.append(Config('option', 'WorkSpace', self.ui.lineEdit_WorkSpace.text()))
146 157
            configs.append(Config('option', 'TagFontSize', self._tag_font_size))
147 158
            configs.append(Config('option', 'TagFontColor', self._tag_text_color))
148 159
            configs.append(Config('option', 'CalloutFontSize', self._callout_font_size))
149 160
            configs.append(Config('option', 'CalloutTextColor', self._callout_text_color))
161
            configs.append(Config('option', 'TagBold', text_checked))
162
            configs.append(Config('option', 'CalloutBold', callout_checked))
150 163
            configs.append(Config('app', 'update_url', self.ui.lineEditUpdateURL.text()))
151 164

  
152 165
            app_doc_data.saveAppConfigs(configs)
......
157 170
            from App import App
158 171
            from AppDocData import MessageType
159 172

  
160
            message = 'error occurred({ex}) in {sys.exc_info()[-1].tb_frame.f_code.co_filename}:' \
161
                      '{sys.exc_info()[-1].tb_lineno}'
173
            message = f'error occurred({ex}) in {sys.exc_info()[-1].tb_frame.f_code.co_filename}:' \
174
                      f'{sys.exc_info()[-1].tb_lineno}'
162 175
            App.mainWnd().addMessage.emit(MessageType.Error, message)
163 176

  
164 177
    def reject(self):
HYTOS/HYTOS/Options_UI.py
1 1
# -*- coding: utf-8 -*-
2 2

  
3
# Form implementation generated from reading ui file '.\HYTOS\UI\Options.ui'
3
# Form implementation generated from reading ui file '.\UI\Options.ui'
4 4
#
5 5
# Created by: PyQt5 UI code generator 5.15.2
6 6
#
......
76 76
        self.gridLayout_7.setObjectName("gridLayout_7")
77 77
        self.gridLayout_6 = QtWidgets.QGridLayout()
78 78
        self.gridLayout_6.setObjectName("gridLayout_6")
79
        self.label_4 = QtWidgets.QLabel(self.groupBoxCallout)
80
        self.label_4.setObjectName("label_4")
81
        self.gridLayout_6.addWidget(self.label_4, 0, 0, 1, 1)
82
        self.pushButtonCalloutTextColor = QtWidgets.QPushButton(self.groupBoxCallout)
83
        self.pushButtonCalloutTextColor.setText("")
84
        self.pushButtonCalloutTextColor.setObjectName("pushButtonCalloutTextColor")
85
        self.gridLayout_6.addWidget(self.pushButtonCalloutTextColor, 0, 3, 1, 1)
86
        self.label_5 = QtWidgets.QLabel(self.groupBoxCallout)
87
        self.label_5.setObjectName("label_5")
88
        self.gridLayout_6.addWidget(self.label_5, 0, 2, 1, 1)
89 79
        self.comboBoxCalloutFontSize = QtWidgets.QComboBox(self.groupBoxCallout)
90 80
        self.comboBoxCalloutFontSize.setObjectName("comboBoxCalloutFontSize")
91 81
        self.comboBoxCalloutFontSize.addItem("")
......
98 88
        self.comboBoxCalloutFontSize.addItem("")
99 89
        self.comboBoxCalloutFontSize.addItem("")
100 90
        self.gridLayout_6.addWidget(self.comboBoxCalloutFontSize, 0, 1, 1, 1)
91
        self.label_5 = QtWidgets.QLabel(self.groupBoxCallout)
92
        self.label_5.setObjectName("label_5")
93
        self.gridLayout_6.addWidget(self.label_5, 0, 3, 1, 1)
94
        self.pushButtonCalloutTextColor = QtWidgets.QPushButton(self.groupBoxCallout)
95
        self.pushButtonCalloutTextColor.setText("")
96
        self.pushButtonCalloutTextColor.setObjectName("pushButtonCalloutTextColor")
97
        self.gridLayout_6.addWidget(self.pushButtonCalloutTextColor, 0, 4, 1, 1)
98
        self.label_4 = QtWidgets.QLabel(self.groupBoxCallout)
99
        self.label_4.setObjectName("label_4")
100
        self.gridLayout_6.addWidget(self.label_4, 0, 0, 1, 1)
101
        self.checkBoxCalloutBold = QtWidgets.QCheckBox(self.groupBoxCallout)
102
        self.checkBoxCalloutBold.setObjectName("checkBoxCalloutBold")
103
        self.gridLayout_6.addWidget(self.checkBoxCalloutBold, 0, 2, 1, 1)
101 104
        self.gridLayout_7.addLayout(self.gridLayout_6, 0, 0, 1, 1)
102 105
        self.gridLayout_2.addWidget(self.groupBoxCallout, 1, 0, 1, 1)
103 106
        self.groupBox_2 = QtWidgets.QGroupBox(OptionsDialog)
......
110 113
        self.gridLayout_3.setObjectName("gridLayout_3")
111 114
        self.gridLayout_8 = QtWidgets.QGridLayout()
112 115
        self.gridLayout_8.setObjectName("gridLayout_8")
116
        self.label = QtWidgets.QLabel(self.groupBox_2)
117
        self.label.setMinimumSize(QtCore.QSize(0, 0))
118
        self.label.setMaximumSize(QtCore.QSize(16777215, 16777215))
119
        font = QtGui.QFont()
120
        font.setBold(False)
121
        font.setWeight(50)
122
        self.label.setFont(font)
123
        self.label.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
124
        self.label.setObjectName("label")
125
        self.gridLayout_8.addWidget(self.label, 0, 0, 1, 1)
126
        self.pushButton_TagFontColor = QtWidgets.QPushButton(self.groupBox_2)
127
        self.pushButton_TagFontColor.setMinimumSize(QtCore.QSize(0, 0))
128
        self.pushButton_TagFontColor.setMaximumSize(QtCore.QSize(16777215, 16777215))
129
        font = QtGui.QFont()
130
        font.setBold(False)
131
        font.setWeight(50)
132
        self.pushButton_TagFontColor.setFont(font)
133
        self.pushButton_TagFontColor.setText("")
134
        self.pushButton_TagFontColor.setObjectName("pushButton_TagFontColor")
135
        self.gridLayout_8.addWidget(self.pushButton_TagFontColor, 0, 4, 1, 1)
113 136
        self.comboBox_TagFontSize = QtWidgets.QComboBox(self.groupBox_2)
114 137
        self.comboBox_TagFontSize.setMinimumSize(QtCore.QSize(0, 0))
115 138
        self.comboBox_TagFontSize.setMaximumSize(QtCore.QSize(16777215, 16777215))
......
130 153
        font.setWeight(50)
131 154
        self.label_3.setFont(font)
132 155
        self.label_3.setObjectName("label_3")
133
        self.gridLayout_8.addWidget(self.label_3, 0, 2, 1, 1)
134
        self.label = QtWidgets.QLabel(self.groupBox_2)
135
        self.label.setMinimumSize(QtCore.QSize(0, 0))
136
        self.label.setMaximumSize(QtCore.QSize(16777215, 16777215))
137
        font = QtGui.QFont()
138
        font.setBold(False)
139
        font.setWeight(50)
140
        self.label.setFont(font)
141
        self.label.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
142
        self.label.setObjectName("label")
143
        self.gridLayout_8.addWidget(self.label, 0, 0, 1, 1)
144
        self.pushButton_TagFontColor = QtWidgets.QPushButton(self.groupBox_2)
145
        self.pushButton_TagFontColor.setMinimumSize(QtCore.QSize(0, 0))
146
        self.pushButton_TagFontColor.setMaximumSize(QtCore.QSize(16777215, 16777215))
147
        font = QtGui.QFont()
148
        font.setBold(False)
149
        font.setWeight(50)
150
        self.pushButton_TagFontColor.setFont(font)
151
        self.pushButton_TagFontColor.setText("")
152
        self.pushButton_TagFontColor.setObjectName("pushButton_TagFontColor")
153
        self.gridLayout_8.addWidget(self.pushButton_TagFontColor, 0, 3, 1, 1)
156
        self.gridLayout_8.addWidget(self.label_3, 0, 3, 1, 1)
157
        self.checkBoxTextBold = QtWidgets.QCheckBox(self.groupBox_2)
158
        self.checkBoxTextBold.setObjectName("checkBoxTextBold")
159
        self.gridLayout_8.addWidget(self.checkBoxTextBold, 0, 2, 1, 1)
154 160
        self.gridLayout_3.addLayout(self.gridLayout_8, 0, 0, 1, 1)
155 161
        self.gridLayout_2.addWidget(self.groupBox_2, 0, 0, 1, 1)
156 162

  
......
172 178
        self.label_2.setText(_translate("OptionsDialog", "Work Space :"))
173 179
        self.toolButton_WorkSpace.setText(_translate("OptionsDialog", "..."))
174 180
        self.groupBoxCallout.setTitle(_translate("OptionsDialog", "Callout"))
175
        self.label_4.setText(_translate("OptionsDialog", "Font Size"))
176
        self.label_5.setText(_translate("OptionsDialog", "Text Color"))
177 181
        self.comboBoxCalloutFontSize.setItemText(0, _translate("OptionsDialog", "5"))
178 182
        self.comboBoxCalloutFontSize.setItemText(1, _translate("OptionsDialog", "6"))
179 183
        self.comboBoxCalloutFontSize.setItemText(2, _translate("OptionsDialog", "7"))
......
183 187
        self.comboBoxCalloutFontSize.setItemText(6, _translate("OptionsDialog", "11"))
184 188
        self.comboBoxCalloutFontSize.setItemText(7, _translate("OptionsDialog", "12"))
185 189
        self.comboBoxCalloutFontSize.setItemText(8, _translate("OptionsDialog", "13"))
190
        self.label_5.setText(_translate("OptionsDialog", "Text Color"))
191
        self.label_4.setText(_translate("OptionsDialog", "Font Size"))
192
        self.checkBoxCalloutBold.setText(_translate("OptionsDialog", "Bold"))
186 193
        self.groupBox_2.setTitle(_translate("OptionsDialog", "Text Style"))
194
        self.label.setText(_translate("OptionsDialog", "Font Size :"))
187 195
        self.comboBox_TagFontSize.setItemText(0, _translate("OptionsDialog", "5"))
188 196
        self.comboBox_TagFontSize.setItemText(1, _translate("OptionsDialog", "6"))
189 197
        self.comboBox_TagFontSize.setItemText(2, _translate("OptionsDialog", "7"))
......
194 202
        self.comboBox_TagFontSize.setItemText(7, _translate("OptionsDialog", "12"))
195 203
        self.comboBox_TagFontSize.setItemText(8, _translate("OptionsDialog", "13"))
196 204
        self.label_3.setText(_translate("OptionsDialog", "Text Color :"))
197
        self.label.setText(_translate("OptionsDialog", "Font Size :"))
205
        self.checkBoxTextBold.setText(_translate("OptionsDialog", "Bold"))
198 206
import Resource_rc
HYTOS/HYTOS/Shapes/EngineeringCalloutTextItem.py
146 146
        if configs and len(configs) == 1:
147 147
            self.setDefaultTextColor(QColor(configs[0].value))
148 148

  
149
        configs = app_doc_data.getAppConfigs('option', 'CalloutBold')
150
        if configs and len(configs) == 1:
151
            _font = self.font()
152
            _font.setBold(configs[0].value == '1')
153
            self.setFont(_font)
154

  
149 155
        '''setHtml해줘야 폰트와 색상이 적용됨'''
150 156
        self.setHtml(self.toPlainText().replace('\n', '<br>'))
151 157

  
HYTOS/HYTOS/Shapes/EngineeringEqpDescTextItem.py
37 37
        font_size = configs[0].value if configs and len(configs) == 1 else '6'
38 38
        configs = app_doc_data.getAppConfigs('option', 'TagFontColor')
39 39
        font_color = configs[0].value if configs and len(configs) == 1 else '#000000'
40
        configs = app_doc_data.getAppConfigs('option', 'TagBold')
41
        bold = configs[0].value if configs and len(configs) == 1 else '0'
40 42
        font.setPointSizeF(float(font_size))
43
        font.setBold(bold == '1')
41 44
        self.setFont(font)
42 45
        self.setDefaultTextColor(QColor(font_color))
43 46

  
HYTOS/HYTOS/UI/Options.ui
122 122
     <layout class="QGridLayout" name="gridLayout_7">
123 123
      <item row="0" column="0">
124 124
       <layout class="QGridLayout" name="gridLayout_6">
125
        <item row="0" column="0">
126
         <widget class="QLabel" name="label_4">
127
          <property name="text">
128
           <string>Font Size</string>
129
          </property>
130
         </widget>
131
        </item>
132
        <item row="0" column="3">
133
         <widget class="QPushButton" name="pushButtonCalloutTextColor">
134
          <property name="text">
135
           <string/>
136
          </property>
137
         </widget>
138
        </item>
139
        <item row="0" column="2">
140
         <widget class="QLabel" name="label_5">
141
          <property name="text">
142
           <string>Text Color</string>
143
          </property>
144
         </widget>
145
        </item>
146 125
        <item row="0" column="1">
147 126
         <widget class="QComboBox" name="comboBoxCalloutFontSize">
148 127
          <item>
......
192 171
          </item>
193 172
         </widget>
194 173
        </item>
174
        <item row="0" column="3">
175
         <widget class="QLabel" name="label_5">
176
          <property name="text">
177
           <string>Text Color</string>
178
          </property>
179
         </widget>
180
        </item>
181
        <item row="0" column="4">
182
         <widget class="QPushButton" name="pushButtonCalloutTextColor">
183
          <property name="text">
184
           <string/>
185
          </property>
186
         </widget>
187
        </item>
188
        <item row="0" column="0">
189
         <widget class="QLabel" name="label_4">
190
          <property name="text">
191
           <string>Font Size</string>
192
          </property>
193
         </widget>
194
        </item>
195
        <item row="0" column="2">
196
         <widget class="QCheckBox" name="checkBoxCalloutBold">
197
          <property name="text">
198
           <string>Bold</string>
199
          </property>
200
         </widget>
201
        </item>
195 202
       </layout>
196 203
      </item>
197 204
     </layout>
......
211 218
     <layout class="QGridLayout" name="gridLayout_3">
212 219
      <item row="0" column="0">
213 220
       <layout class="QGridLayout" name="gridLayout_8">
221
        <item row="0" column="0">
222
         <widget class="QLabel" name="label">
223
          <property name="minimumSize">
224
           <size>
225
            <width>0</width>
226
            <height>0</height>
227
           </size>
228
          </property>
229
          <property name="maximumSize">
230
           <size>
231
            <width>16777215</width>
232
            <height>16777215</height>
233
           </size>
234
          </property>
235
          <property name="font">
236
           <font>
237
            <weight>50</weight>
238
            <bold>false</bold>
239
           </font>
240
          </property>
241
          <property name="text">
242
           <string>Font Size :</string>
243
          </property>
244
          <property name="alignment">
245
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
246
          </property>
247
         </widget>
248
        </item>
249
        <item row="0" column="4">
250
         <widget class="QPushButton" name="pushButton_TagFontColor">
251
          <property name="minimumSize">
252
           <size>
253
            <width>0</width>
254
            <height>0</height>
255
           </size>
256
          </property>
257
          <property name="maximumSize">
258
           <size>
259
            <width>16777215</width>
260
            <height>16777215</height>
261
           </size>
262
          </property>
263
          <property name="font">
264
           <font>
265
            <weight>50</weight>
266
            <bold>false</bold>
267
           </font>
268
          </property>
269
          <property name="text">
270
           <string/>
271
          </property>
272
         </widget>
273
        </item>
214 274
        <item row="0" column="1">
215 275
         <widget class="QComboBox" name="comboBox_TagFontSize">
216 276
          <property name="minimumSize">
......
272 332
          </item>
273 333
         </widget>
274 334
        </item>
275
        <item row="0" column="2">
335
        <item row="0" column="3">
276 336
         <widget class="QLabel" name="label_3">
277 337
          <property name="font">
278 338
           <font>
......
285 345
          </property>
286 346
         </widget>
287 347
        </item>
288
        <item row="0" column="0">
289
         <widget class="QLabel" name="label">
290
          <property name="minimumSize">
291
           <size>
292
            <width>0</width>
293
            <height>0</height>
294
           </size>
295
          </property>
296
          <property name="maximumSize">
297
           <size>
298
            <width>16777215</width>
299
            <height>16777215</height>
300
           </size>
301
          </property>
302
          <property name="font">
303
           <font>
304
            <weight>50</weight>
305
            <bold>false</bold>
306
           </font>
307
          </property>
308
          <property name="text">
309
           <string>Font Size :</string>
310
          </property>
311
          <property name="alignment">
312
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
313
          </property>
314
         </widget>
315
        </item>
316
        <item row="0" column="3">
317
         <widget class="QPushButton" name="pushButton_TagFontColor">
318
          <property name="minimumSize">
319
           <size>
320
            <width>0</width>
321
            <height>0</height>
322
           </size>
323
          </property>
324
          <property name="maximumSize">
325
           <size>
326
            <width>16777215</width>
327
            <height>16777215</height>
328
           </size>
329
          </property>
330
          <property name="font">
331
           <font>
332
            <weight>50</weight>
333
            <bold>false</bold>
334
           </font>
335
          </property>
348
        <item row="0" column="2">
349
         <widget class="QCheckBox" name="checkBoxTextBold">
336 350
          <property name="text">
337
           <string/>
351
           <string>Bold</string>
338 352
          </property>
339 353
         </widget>
340 354
        </item>
readme.html
37 37
			<td style="padding-left: 5px; font-weight: bold;" colspan="2"><font color="white" size="3">CHANGES</font></td>
38 38
		</tr>
39 39
		
40
		<tr><td style="tr-title" colspan="2"><strong>3.3.2.0 [2021.04.27]</strong></td></tr>
40
		<tr><td style="tr-title" colspan="2" bgcolor=lightgray><strong>3.3.3.0 [2021.05.10]</strong></td></tr>
41
		<tr><td class="filesChanged">1.</td><td>Callout 항목의 폰트 크기 및 색상 설정 오류 수정</td></tr>
42
		
43
		<tr><td style="tr-title" colspan="2" bgcolor=lightgray><strong>3.3.2.0 [2021.04.27]</strong></td></tr>
41 44
		<tr><td class="filesChanged">1.</td><td>자동 업데이트 기능 추가</td></tr>
42 45
		
43 46
		<tr><td style="tr-title" colspan="2" bgcolor=lightgray><B>3.2.2.0 [2021.03.25]</B></td></tr>
version.rc
7 7
# filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
8 8
# Set not needed items to zero 0.
9 9
# Local Build $BUILD_NUMBER=0
10
filevers=(3,3,2,0),
11
prodvers=(3,3,2,0),
10
filevers=(3,3,3,0),
11
prodvers=(3,3,3,0),
12 12
# Contains a bitmask that specifies the valid bits 'flags'r
13 13
mask=0x3f,
14 14
# Contains a bitmask that specifies the Boolean attributes of the file.
......
32 32
    u'040904B0',
33 33
    [StringStruct(u'CompanyName', u'SECL'),
34 34
    StringStruct(u'FileDescription', u'Hydraulic Calculator'),
35
    StringStruct(u'FileVersion', u'3.3.2.0'),
35
    StringStruct(u'FileVersion', u'3.3.3.0'),
36 36
    StringStruct(u'InternalName', u'HYTOS'),
37 37
    StringStruct(u'LegalCopyright', u'Copyright(c) SECL'),
38 38
    StringStruct(u'OriginalFilename', u'HYTOS.exe'),
39 39
    StringStruct(u'ProductName', u'HYTOS'),
40
    StringStruct(u'ProductVersion', u'3.3.2.0')])
40
    StringStruct(u'ProductVersion', u'3.3.3.0')])
41 41
  ]), 
42 42
VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
43 43
  ]

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)