r17828 by craig - Add additional footnotes files and update some

[scribus-commit]

Author: craig
Date: Sat Oct 27 16:23:43 2012
New Revision: 17828

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17828
Log:
Add additional footnotes files and update some

Added:
    trunk/Scribus/scribus/ui/markinsert.h   (with props)
    trunk/Scribus/scribus/ui/notesstyleseditor.ui
Modified:
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/ui/mark2item.h
    trunk/Scribus/scribus/ui/mark2mark.h
    trunk/Scribus/scribus/ui/markanchor.h
    trunk/Scribus/scribus/ui/marknote.h
    trunk/Scribus/scribus/ui/markvariabletext.h

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17828&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Sat Oct 27 16:23:43 2012
@@ -327,13 +327,13 @@
   ui/latexeditor.h
   ui/layers.h
   ui/loremipsum.h
-ui/MarkInsertDlg.h
-ui/mark2item.h
-ui/mark2mark.h
-ui/markanchor.h
-ui/marknote.h
-ui/markvariabletext.h
-ui/marksmanager.h
+  ui/markinsert.h
+  ui/mark2item.h
+  ui/mark2mark.h
+  ui/markanchor.h
+  ui/marknote.h
+  ui/markvariabletext.h
+  ui/marksmanager.h
   ui/margindialog.h
   ui/marginpresetlayout.h
   ui/marginwidget.h

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17828&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sat Oct 27 16:23:43 2012
@@ -172,7 +172,7 @@
 #include "ui/markanchor.h"
 #include "ui/marknote.h"
 #include "ui/markvariabletext.h"
-#include "ui/MarkInsertDlg.h"
+#include "ui/markinsert.h"
 #include "ui/marksmanager.h"
 #include "ui/masterpagepalette.h"
 #include "ui/mergedoc.h"

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17828&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Sat Oct 27 16:23:43 2012
@@ -106,7 +106,7 @@
 #include "colormgmt/sccolormgmtenginefactory.h"
 #include "ui/hruler.h"
 #include "ui/layers.h"
-#include "ui/MarkInsertDlg.h"
+#include "ui/markinsert.h"
 #include "ui/mark2item.h"
 #include "ui/mark2mark.h"
 #include "ui/markanchor.h"

Modified: trunk/Scribus/scribus/ui/mark2item.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17828&path=/trunk/Scribus/scribus/ui/mark2item.h
==============================================================================
--- trunk/Scribus/scribus/ui/mark2item.h (original)
+++ trunk/Scribus/scribus/ui/mark2item.h Sat Oct 27 16:23:43 2012
@@ -1,7 +1,7 @@
 #ifndef MARK2ITEM_H
 #define MARK2ITEM_H
 
-#include "MarkInsertDlg.h"
+#include "markinsert.h"
 #include "ui_mark2item.h"
 
 class SCRIBUS_API Mark2ItemDlg : public MarkInsertDlg, private Ui::Mark2ItemDlg

Modified: trunk/Scribus/scribus/ui/mark2mark.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17828&path=/trunk/Scribus/scribus/ui/mark2mark.h
==============================================================================
--- trunk/Scribus/scribus/ui/mark2mark.h (original)
+++ trunk/Scribus/scribus/ui/mark2mark.h Sat Oct 27 16:23:43 2012
@@ -1,7 +1,7 @@
 #ifndef MARK2MARK_H
 #define MARK2MARK_H
 
-#include "MarkInsertDlg.h"
+#include "markinsert.h"
 #include "ui_mark2mark.h"
 
 class SCRIBUS_API Mark2MarkDlg : public MarkInsertDlg, private Ui::Mark2MarkDlg

Modified: trunk/Scribus/scribus/ui/markanchor.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17828&path=/trunk/Scribus/scribus/ui/markanchor.h
==============================================================================
--- trunk/Scribus/scribus/ui/markanchor.h (original)
+++ trunk/Scribus/scribus/ui/markanchor.h Sat Oct 27 16:23:43 2012
@@ -1,7 +1,7 @@
 #ifndef MARKANCHOR_H
 #define MARKANCHOR_H
 
-#include "MarkInsertDlg.h"
+#include "markinsert.h"
 #include "ui_markanchor.h"
 
 class SCRIBUS_API MarkAnchorDlg : public MarkInsertDlg, private Ui::MarkAnchorDlg

Modified: trunk/Scribus/scribus/ui/marknote.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17828&path=/trunk/Scribus/scribus/ui/marknote.h
==============================================================================
--- trunk/Scribus/scribus/ui/marknote.h (original)
+++ trunk/Scribus/scribus/ui/marknote.h Sat Oct 27 16:23:43 2012
@@ -1,7 +1,7 @@
 #ifndef MARKNOTE_H
 #define MARKNOTE_H
 
-#include "MarkInsertDlg.h"
+#include "markinsert.h"
 #include "notesstyles.h"
 #include "ui_marknote.h"
 

Modified: trunk/Scribus/scribus/ui/markvariabletext.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17828&path=/trunk/Scribus/scribus/ui/markvariabletext.h
==============================================================================
--- trunk/Scribus/scribus/ui/markvariabletext.h (original)
+++ trunk/Scribus/scribus/ui/markvariabletext.h Sat Oct 27 16:23:43 2012
@@ -2,7 +2,7 @@
 #define MARKVARIABLETEXT_H
 
 #include "scribusapi.h"
-#include "MarkInsertDlg.h"
+#include "markinsert.h"
 #include "ui_markvariabletext.h"
 
 class SCRIBUS_API MarkVariableTextDlg : public MarkInsertDlg, private Ui::MarkVariableTextDlg