Skip to content

Commit

Permalink
#49 Move Ok button out of scroll area. Move position information high…
Browse files Browse the repository at this point in the history
…er in text
  • Loading branch information
ryanmelt committed Feb 10, 2015
1 parent 5a06bb0 commit f1c4bc2
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions lib/cosmos/gui/dialogs/about_dialog.rb
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,9 @@ def initialize (parent, about_string)
configurable_about_text = File.read(filename)
configurable_about_text.gsub!("\r", '') unless Kernel.is_windows?
if Kernel.is_windows?
configurable_about_text += "\n" + ABOUT_COSMOS + "\n" + "Main Application x:#{parent.x} y:#{parent.y} width:#{parent.frameGeometry.width + 16} height:#{parent.frameGeometry.height + 38}"
configurable_about_text += "\n" + "Main Application x:#{parent.x} y:#{parent.y} width:#{parent.frameGeometry.width + 16} height:#{parent.frameGeometry.height + 38}\n\n" + ABOUT_COSMOS
else
configurable_about_text += "\n" + ABOUT_COSMOS + "\n" + "Main Application x:#{parent.x} y:#{parent.y} width:#{parent.frameGeometry.width} height:#{parent.frameGeometry.height}"
end
configurable_about_text += "\n" + "Main Application x:#{parent.x} y:#{parent.y} width:#{parent.frameGeometry.width} height:#{parent.frameGeometry.height}\n\n" + ABOUT_COSMOS end

# Set the application about text
about = Qt::Label.new(about_string + "\n\n" + configurable_about_text)
Expand All @@ -97,7 +96,6 @@ def initialize (parent, about_string)
interior_layout = Qt::VBoxLayout.new
interior_layout.addLayout(icon_layout)
interior_layout.addWidget(about)
interior_layout.addLayout(button_layout)
scroll_widget.setLayout(interior_layout)
if scroll_widget.minimumSizeHint.height < 800
scroll_area.setMinimumHeight(scroll_widget.minimumSizeHint.height + 80)
Expand All @@ -106,6 +104,7 @@ def initialize (parent, about_string)
scroll_area.setMinimumWidth(scroll_widget.minimumSizeHint.width + 20)
end
scroll_widget.adjustSize
addLayout(button_layout)
end

setMaximumWidth(600)
Expand Down

0 comments on commit f1c4bc2

Please sign in to comment.