openshot.code team mailing list archive
-
openshot.code team
-
Mailing list archive
-
Message #00051
[Branch ~openshot.code/openshot/main] Rev 543: Removed "Bit Rate" from the "File Properties" screen, since it was actually displaying FPS. And ...
------------------------------------------------------------
revno: 543
committer: Jonathan Thomas <Jonathan.Oomph@xxxxxxxxx>
branch nick: openshot
timestamp: Fri 2011-09-02 01:41:59 -0500
message:
Removed "Bit Rate" from the "File Properties" screen, since it was actually displaying FPS. And then, I realized, the FPS was simply the current profile's FPS, and not the actual file's FPS. So, I just removed the line and cleaned up the File Properties screen a bit.
modified:
openshot/windows/FileProperties.py
openshot/windows/ui/FileProperties.ui
--
lp:openshot
https://code.launchpad.net/~openshot.code/openshot/main
Your team OpenShot Code is subscribed to branch lp:openshot.
To unsubscribe from this branch go to https://code.launchpad.net/~openshot.code/openshot/main/+edit-subscription
=== modified file 'openshot/windows/FileProperties.py'
--- openshot/windows/FileProperties.py 2011-08-11 21:59:28 +0000
+++ openshot/windows/FileProperties.py 2011-09-02 06:41:59 +0000
@@ -63,13 +63,9 @@
#project label
self.txtLabel.set_text(file.label)
- if file.file_type.startswith("video"):
- #video specific properties
- self.lblRateValue.set_label(str(file.videorate[0]) + "/" + str(file.videorate[1]))
+ if file.file_type in ["video", "image", "image sequence"]:
self.lblSizeValue.set_label(str(file.width) + " x " + str(file.height))
-
else:
- self.lblRate.set_sensitive(False)
self.lblSize.set_sensitive(False)
#show the form
@@ -83,8 +79,8 @@
# update path of file
self.file.name = self.lblLocation1.get_text()
- if self.txtLabel.get_text() == "":
- return
+ #if self.txtLabel.get_text() == "":
+ # return
self.project.project_folder.UpdateFileLabel(self.file.unique_id, self.txtLabel.get_text(), 1)
self.frmFileProperties.destroy()
=== modified file 'openshot/windows/ui/FileProperties.ui'
--- openshot/windows/ui/FileProperties.ui 2010-04-03 18:52:42 +0000
+++ openshot/windows/ui/FileProperties.ui 2011-09-02 06:41:59 +0000
@@ -4,7 +4,7 @@
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkDialog" id="frmFileProperties">
<property name="width_request">450</property>
- <property name="height_request">270</property>
+ <property name="height_request">250</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">File Properties</property>
@@ -17,13 +17,11 @@
<object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="orientation">vertical</property>
<child>
<object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
@@ -38,6 +36,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="padding">6</property>
<property name="position">0</property>
</packing>
</child>
@@ -61,13 +60,14 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
<object class="GtkImage" id="imgPreview">
- <property name="width_request">120</property>
+ <property name="width_request">100</property>
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="yalign">0</property>
<property name="stock">gtk-missing-image</property>
</object>
<packing>
+ <property name="padding">6</property>
<property name="position">0</property>
</packing>
</child>
@@ -85,7 +85,7 @@
<object class="GtkTable" id="table1">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">7</property>
+ <property name="n_rows">4</property>
<property name="n_columns">2</property>
<child>
<object class="GtkLabel" id="lblLengthValue">
@@ -95,8 +95,8 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
</packing>
</child>
<child>
@@ -109,8 +109,8 @@
<property name="use_markup">True</property>
</object>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
</packing>
</child>
<child>
@@ -121,8 +121,8 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
</packing>
</child>
<child>
@@ -135,32 +135,6 @@
<property name="use_markup">True</property>
</object>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="lblRateValue">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="lblRate">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="xpad">2</property>
- <property name="label" translatable="yes"><b>Bit Rate:</b></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
</packing>
@@ -197,18 +171,6 @@
<child>
<placeholder/>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="position">2</property>
@@ -244,6 +206,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="padding">6</property>
<property name="position">0</property>
</packing>
</child>
