diff --git a/openlp/resources/forms/about.ui b/openlp/resources/forms/about.ui
index 473dd6b36..96f7f4f54 100644
--- a/openlp/resources/forms/about.ui
+++ b/openlp/resources/forms/about.ui
@@ -26,16 +26,13 @@
-
- true
+ false
background-color: rgb(255, 255, 255);
- QFrame::WinPanel
-
-
- QFrame::Sunken
+ QFrame::StyledPanel
1
@@ -57,7 +54,7 @@
-
- 0
+ 1
@@ -171,9 +168,9 @@
- 30
+ 6
0
- 353
+ 400
760
@@ -185,7 +182,7 @@
- 353
+ 400
760
@@ -348,6 +345,7 @@ p, li { white-space: pre-wrap; }
+
diff --git a/openlp/resources/forms/openlpexportform.ui b/openlp/resources/forms/openlpexportform.ui
new file mode 100644
index 000000000..8f86caef3
--- /dev/null
+++ b/openlp/resources/forms/openlpexportform.ui
@@ -0,0 +1,608 @@
+
+ OpenLPExportForm
+
+
+
+ 0
+ 0
+ 473
+ 459
+
+
+
+ openlp.org Song Exporter
+
+
+
+ 8
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 3
+
+
+ 0
+
+
-
+
+
+ Select openlp.org export filename:
+
+
+
+ -
+
+
+ -
+
+
+
+
+
+
+ :/exports/export_load.png:/exports/export_load.png
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ QFrame::Box
+
+
+ QFrame::Raised
+
+
+
+ 8
+
+
+ 8
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 6
+
+
+ 0
+
+
-
+
+
+ Full Song List
+
+
+
+ -
+
+
+ QAbstractItemView::MultiSelection
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+
+ Song Title
+
+
+
+
+ Author
+
+
+
+
+ -
+
+
+
+ 6
+
+
+ 0
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 100
+ 0
+
+
+
+ Select All
+
+
+
+ :/exports/export_selectall.png:/exports/export_selectall.png
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Expanding
+
+
+
+ 89
+ 20
+
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+
+
-
+
+
+
+ 70
+ 0
+
+
+
-
+
+ Lyrics
+
+
+ -
+
+ Title
+
+
+ -
+
+ Author
+
+
+
+
+ -
+
+
+
+
+
+
+ exportFilterWidget
+ ExportListTable
+ ExportListLabel
+ ExportSelectAllWidget
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+
+
-
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 25
+ 25
+
+
+
+
+
+
+
+ :/exports/export_move_to_list.png:/exports/export_move_to_list.png
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+
+
-
+
+
+ Song Export List
+
+
+
+ -
+
+
+ QAbstractItemView::MultiSelection
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+
+ Song Title
+
+
+
+
+ Author
+
+
+
+
+ -
+
+
+
+ 6
+
+
+ 0
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 100
+ 0
+
+
+
+ Select All
+
+
+
+ :/exports/export_selectall.png:/exports/export_selectall.png
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Expanding
+
+
+
+ 92
+ 20
+
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 140
+ 0
+
+
+
+ Remove Selected
+
+
+
+ :/exports/export_remove.png:/exports/export_remove.png
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 49
+ 20
+
+
+
+
+
+
+
+
+
+
+
+ ExportFileSongListWidget
+ SelectedFileListWidget
+ AddSelectedWidget
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Progress:
+
+
+
+ 8
+
+
+ 8
+
+
+ 0
+
+
+ 8
+
+
+ 8
+
+
-
+
+
+ Ready to export
+
+
+
+ -
+
+
+ 24
+
+
+
+
+
+
+ -
+
+
+
+ 8
+
+
+ 0
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 288
+ 20
+
+
+
+
+ -
+
+
+ Export
+
+
+
+ -
+
+
+ Close
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ClosePushButton
+ clicked()
+ OpenLPExportForm
+ close()
+
+
+ 436
+ 436
+
+
+ 462
+ 455
+
+
+
+
+ ExportSelectAllPushButton
+ clicked()
+ ExportListTable
+ selectAll()
+
+
+ 75
+ 281
+
+
+ 88
+ 176
+
+
+
+
+ SelectedSelectAllPushButton
+ clicked()
+ SelectedListTable
+ selectAll()
+
+
+ 311
+ 277
+
+
+ 339
+ 190
+
+
+
+
+ SelectedRemoveSelectedButton
+ clicked()
+ SelectedListTable
+ clear()
+
+
+ 379
+ 308
+
+
+ 389
+ 188
+
+
+
+
+
diff --git a/openlp/resources/forms/openlpimportform.ui b/openlp/resources/forms/openlpimportform.ui
index e18e68825..beb504a52 100644
--- a/openlp/resources/forms/openlpimportform.ui
+++ b/openlp/resources/forms/openlpimportform.ui
@@ -39,10 +39,10 @@
-
-
+
-
-
+
@@ -134,7 +134,7 @@
0
-
-
+
0
@@ -152,7 +152,7 @@
- :/imports/import_load.png:/imports/import_load.png
+ :/imports/import_selectall.png:/imports/import_selectall.png
@@ -194,7 +194,7 @@
0
-
-
+
70
@@ -219,20 +219,16 @@
-
-
+
- listWidget
ImportListTable
ImportListLabel
- ImportSelectAllButton
- ImportSelectAllHSpacer
importFilterWidget
ImportSelectAllWidget
- widget_3
-
@@ -261,7 +257,7 @@
-
-
+
0
@@ -279,7 +275,7 @@
- :/imports/import_load.png:/imports/import_load.png
+ :/imports/import_move_to_list.png:/imports/import_move_to_list.png
@@ -354,7 +350,7 @@
0
-
-
+
0
@@ -372,7 +368,7 @@
- :/imports/import_load.png:/imports/import_load.png
+ :/imports/import_selectall.png:/imports/import_selectall.png
@@ -393,8 +389,6 @@
- SelectedSelectAllButton
- SelectedRemoveSelectedWidget
-
@@ -454,7 +448,6 @@
ImportFileSongListWidget
SelectedFileListWidget
- AddSelectedButton
AddSelectedWidget
@@ -525,14 +518,14 @@
-
-
+
Import
-
-
+
Close
@@ -548,7 +541,7 @@
- CloseButton
+ ClosePushButton
clicked()
OpenLPImportForm
close()
@@ -564,7 +557,7 @@
- ImportSelectAllButton
+ ImportSelectAllPushButton
clicked()
ImportListTable
selectAll()
@@ -580,7 +573,7 @@
- SelectedSelectAllButton
+ SelectedSelectAllPushButton
clicked()
SelectedListTable
selectAll()
diff --git a/openlp/resources/images/export_load.png b/openlp/resources/images/export_load.png
new file mode 100644
index 000000000..eb211e233
Binary files /dev/null and b/openlp/resources/images/export_load.png differ
diff --git a/openlp/resources/images/export_move_to_list.png b/openlp/resources/images/export_move_to_list.png
new file mode 100644
index 000000000..5c0005856
Binary files /dev/null and b/openlp/resources/images/export_move_to_list.png differ
diff --git a/openlp/resources/images/export_remove.png b/openlp/resources/images/export_remove.png
new file mode 100644
index 000000000..ef8e685e2
Binary files /dev/null and b/openlp/resources/images/export_remove.png differ
diff --git a/openlp/resources/images/export_selectall.png b/openlp/resources/images/export_selectall.png
new file mode 100644
index 000000000..0f0d9f152
Binary files /dev/null and b/openlp/resources/images/export_selectall.png differ
diff --git a/openlp/resources/images/import_move_to_list.png b/openlp/resources/images/import_move_to_list.png
new file mode 100644
index 000000000..5c0005856
Binary files /dev/null and b/openlp/resources/images/import_move_to_list.png differ
diff --git a/openlp/resources/images/import_selectall.png b/openlp/resources/images/import_selectall.png
new file mode 100644
index 000000000..0f0d9f152
Binary files /dev/null and b/openlp/resources/images/import_selectall.png differ
diff --git a/openlp/resources/images/openlp-2.qrc b/openlp/resources/images/openlp-2.qrc
index 33daa4d5d..d84a42c12 100644
--- a/openlp/resources/images/openlp-2.qrc
+++ b/openlp/resources/images/openlp-2.qrc
@@ -9,9 +9,17 @@
about-new.bmp
+ import_selectall.png
+ import_move_to_list.png
import_remove.png
import_load.png
+
+ export_selectall.png
+ export_remove.png
+ export_load.png
+ export_move_to_list.png
+
custom_new.png
custom_edit.png