[Libreoffice-commits] core.git: extensions/source extensions/uiconfig extensions/UIConfig_sbibliography.mk
Palenik Mihály
palenik.mihaly at gmail.com
Wed Aug 20 06:00:43 PDT 2014
extensions/UIConfig_sbibliography.mk | 1
extensions/source/bibliography/bib.hrc | 28 +
extensions/source/bibliography/bibcont.cxx | 5
extensions/source/bibliography/bibshortcuthandler.hxx | 1
extensions/source/bibliography/bibview.cxx | 1
extensions/source/bibliography/general.cxx | 311 +++++++------
extensions/source/bibliography/general.hxx | 86 +--
extensions/source/bibliography/sections.hrc | 85 ---
extensions/source/bibliography/sections.src | 408 ++++--------------
extensions/uiconfig/sbibliography/ui/generalpage.ui | 12
10 files changed, 346 insertions(+), 592 deletions(-)
New commits:
commit eba5e5b6b6577cc2d0bbd1ff66eefd0e2024fc4e
Author: Palenik Mihály <palenik.mihaly at gmail.com>
Date: Mon Aug 18 13:03:08 2014 +0200
Convert RID_TP_GENERAL tabpage to .ui
Change-Id: I32300c3d06a8c30d8e75f343cd2af8acef7296ae
Reviewed-on: https://gerrit.libreoffice.org/10989
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/extensions/UIConfig_sbibliography.mk b/extensions/UIConfig_sbibliography.mk
index 6cd5c4b..58ec842 100644
--- a/extensions/UIConfig_sbibliography.mk
+++ b/extensions/UIConfig_sbibliography.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/sbibliography,\
$(eval $(call gb_UIConfig_add_uifiles,modules/sbibliography,\
extensions/uiconfig/sbibliography/ui/choosedatasourcedialog \
+ extensions/uiconfig/sbibliography/ui/generalpage \
extensions/uiconfig/sbibliography/ui/mappingdialog \
))
diff --git a/extensions/source/bibliography/bib.hrc b/extensions/source/bibliography/bib.hrc
index fbcf561..f5370bc 100644
--- a/extensions/source/bibliography/bib.hrc
+++ b/extensions/source/bibliography/bib.hrc
@@ -25,10 +25,6 @@
#define RID_BIB_START RID_EXTENSIONS_START
#endif
-//Dialogs (100)
-#define RID_BIB_DIALOG (RID_BIB_START)
-#define RID_TP_GENERAL (RID_BIB_DIALOG)
-
//Controls(100)
#define RID_BIB_CONTROLS (RID_BIB_START + 100)
#define RID_BIB_TOOLBAR (RID_BIB_CONTROLS+ 1)
@@ -78,6 +74,30 @@
#define ST_CUSTOM3 (RID_BIB_STRING + 34)
#define ST_CUSTOM4 (RID_BIB_STRING + 35)
#define ST_CUSTOM5 (RID_BIB_STRING + 36)
+#define ST_ERROR_PREFIX (RID_BIB_STRING + 37)
+#define ST_TYPE_ARTICLE (RID_BIB_STRING + 38)
+#define ST_TYPE_BOOK (RID_BIB_STRING + 39)
+#define ST_TYPE_BOOKLET (RID_BIB_STRING + 40)
+#define ST_TYPE_CONFERENCE (RID_BIB_STRING + 41)
+#define ST_TYPE_INBOOK (RID_BIB_STRING + 42)
+#define ST_TYPE_INCOLLECTION (RID_BIB_STRING + 43)
+#define ST_TYPE_INPROCEEDINGS (RID_BIB_STRING + 44)
+#define ST_TYPE_JOURNAL (RID_BIB_STRING + 45)
+#define ST_TYPE_MANUAL (RID_BIB_STRING + 46)
+#define ST_TYPE_MASTERSTHESIS (RID_BIB_STRING + 47)
+#define ST_TYPE_MISC (RID_BIB_STRING + 48)
+#define ST_TYPE_PHDTHESIS (RID_BIB_STRING + 49)
+#define ST_TYPE_PROCEEDINGS (RID_BIB_STRING + 50)
+#define ST_TYPE_TECHREPORT (RID_BIB_STRING + 51)
+#define ST_TYPE_UNPUBLISHED (RID_BIB_STRING + 52)
+#define ST_TYPE_EMAIL (RID_BIB_STRING + 53)
+#define ST_TYPE_WWW (RID_BIB_STRING + 54)
+#define ST_TYPE_CUSTOM1 (RID_BIB_STRING + 55)
+#define ST_TYPE_CUSTOM2 (RID_BIB_STRING + 56)
+#define ST_TYPE_CUSTOM3 (RID_BIB_STRING + 57)
+#define ST_TYPE_CUSTOM4 (RID_BIB_STRING + 58)
+#define ST_TYPE_CUSTOM5 (RID_BIB_STRING + 59)
+#define ST_TYPE_TITLE (RID_BIB_STRING + 60)
#endif
diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index 3dfd6bf..d4460e7 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -65,6 +65,11 @@ BibTabPage::BibTabPage( Window* pParent, const ResId& rResId ) : TabPage( pParen
{
}
+BibTabPage::BibTabPage( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) :
+ TabPage( pParent, rID, rUIXMLDescription ), BibShortCutHandler( this )
+{
+}
+
BibTabPage::~BibTabPage()
{
}
diff --git a/extensions/source/bibliography/bibshortcuthandler.hxx b/extensions/source/bibliography/bibshortcuthandler.hxx
index 8900544..9b862bc 100644
--- a/extensions/source/bibliography/bibshortcuthandler.hxx
+++ b/extensions/source/bibliography/bibshortcuthandler.hxx
@@ -73,6 +73,7 @@ class BibTabPage : public TabPage, public BibShortCutHandler
{
public:
BibTabPage( Window* pParent, const ResId& rResId );
+ BibTabPage( Window* pParent, const OString& rID, const OUString& rUIXMLDescription );
virtual ~BibTabPage();
};
diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx
index b13740b..341c3a9 100644
--- a/extensions/source/bibliography/bibview.cxx
+++ b/extensions/source/bibliography/bibview.cxx
@@ -26,7 +26,6 @@
#include "datman.hxx"
#include "bibresid.hxx"
#include "bibmod.hxx"
-#include "sections.hrc"
#include "bibconfig.hxx"
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 2babb13..3975bcb 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -29,7 +29,6 @@
#include <cppuhelper/implbase1.hxx>
#include <vcl/settings.hxx>
#include "general.hxx"
-#include "sections.hrc"
#include "bibresid.hxx"
#include "datman.hxx"
#include "bibconfig.hxx"
@@ -177,49 +176,43 @@ void BibPosListener::disposing(const lang::EventObject& /*Source*/) throw( uno::
}
BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan):
- BibTabPage(pParent,BibResId(RID_TP_GENERAL)),
- aControlParentWin(this, WB_DIALOGCONTROL),
- aIdentifierFT(&aControlParentWin, BibResId(FT_IDENTIFIER )),
- aAuthTypeFT(&aControlParentWin, BibResId(FT_AUTHTYPE )),
- aYearFT(&aControlParentWin, BibResId(FT_YEAR )),
- aAuthorFT(&aControlParentWin, BibResId(FT_AUTHOR )),
- aTitleFT(&aControlParentWin, BibResId(FT_TITLE )),
- aPublisherFT(&aControlParentWin, BibResId(FT_PUBLISHER )),
- aAddressFT(&aControlParentWin, BibResId(FT_ADDRESS )),
- aISBNFT(&aControlParentWin, BibResId(FT_ISBN )),
- aChapterFT(&aControlParentWin, BibResId(FT_CHAPTER )),
- aPagesFT(&aControlParentWin, BibResId(FT_PAGE )),
- aFirstFL(&aControlParentWin, BibResId(FL_1 )),
- aEditorFT(&aControlParentWin, BibResId(FT_EDITOR )),
- aEditionFT(&aControlParentWin, BibResId(FT_EDITION )),
- aBooktitleFT(&aControlParentWin, BibResId(FT_BOOKTITLE )),
- aVolumeFT(&aControlParentWin, BibResId(FT_VOLUME )),
- aHowpublishedFT(&aControlParentWin, BibResId(FT_HOWPUBLISHED )),
- aOrganizationsFT(&aControlParentWin,BibResId(FT_ORGANIZATION )),
- aInstitutionFT(&aControlParentWin, BibResId(FT_INSTITUTION )),
- aSchoolFT(&aControlParentWin, BibResId(FT_SCHOOL )),
- aReportTypeFT(&aControlParentWin, BibResId(FT_REPORT )),
- aMonthFT(&aControlParentWin, BibResId(FT_MONTH )),
- aSecondFL(&aControlParentWin, BibResId(FL_2 )),
- aJournalFT(&aControlParentWin, BibResId(FT_JOURNAL )),
- aNumberFT(&aControlParentWin, BibResId(FT_NUMBER )),
- aSeriesFT(&aControlParentWin, BibResId(FT_SERIES )),
- aAnnoteFT(&aControlParentWin, BibResId(FT_ANNOTE )),
- aNoteFT(&aControlParentWin, BibResId(FT_NOTE )),
- aURLFT(&aControlParentWin, BibResId(FT_URL )),
- aThirdFL(&aControlParentWin, BibResId(FL_3 )),
- aCustom1FT(&aControlParentWin, BibResId(FT_CUSTOM1 )),
- aCustom2FT(&aControlParentWin, BibResId(FT_CUSTOM2 )),
- aCustom3FT(&aControlParentWin, BibResId(FT_CUSTOM3 )),
- aCustom4FT(&aControlParentWin, BibResId(FT_CUSTOM4 )),
- aCustom5FT(&aControlParentWin, BibResId(FT_CUSTOM5 )),
+ BibTabPage(pParent, "GeneralPage", "modules/sbibliography/ui/generalpage.ui"),
+ pIdentifierFT(new FixedText(this)),
+ pAuthTypeFT(new FixedText(this)),
+ pYearFT(new FixedText(this)),
+ pAuthorFT(new FixedText(this)),
+ pTitleFT(new FixedText(this)),
+ pPublisherFT(new FixedText(this)),
+ pAddressFT(new FixedText(this)),
+ pISBNFT(new FixedText(this)),
+ pChapterFT(new FixedText(this)),
+ pPagesFT(new FixedText(this)),
+ pEditorFT(new FixedText(this)),
+ pEditionFT(new FixedText(this)),
+ pBooktitleFT(new FixedText(this)),
+ pVolumeFT(new FixedText(this)),
+ pHowpublishedFT(new FixedText(this)),
+ pOrganizationsFT(new FixedText(this)),
+ pInstitutionFT(new FixedText(this)),
+ pSchoolFT(new FixedText(this)),
+ pReportTypeFT(new FixedText(this)),
+ pMonthFT(new FixedText(this)),
+ pJournalFT(new FixedText(this)),
+ pNumberFT(new FixedText(this)),
+ pSeriesFT(new FixedText(this)),
+ pAnnoteFT(new FixedText(this)),
+ pNoteFT(new FixedText(this)),
+ pURLFT(new FixedText(this)),
+ pCustom1FT(new FixedText(this)),
+ pCustom2FT(new FixedText(this)),
+ pCustom3FT(new FixedText(this)),
+ pCustom4FT(new FixedText(this)),
+ pCustom5FT(new FixedText(this)),
aHoriScroll(this, WB_HORZ),
aVertScroll(this, WB_VERT),
sErrorPrefix(BIB_RESSTR(ST_ERROR_PREFIX)),
pDatMan(pMan)
{
- aControlParentWin.Show();
- aControlParentWin.SetHelpId(HID_BIB_CONTROL_PARENT);
aStdSize = GetOutputSizePixel();
aBibTypeArr[0] = BIB_RESSTR(ST_TYPE_ARTICLE);
@@ -245,11 +238,9 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan):
aBibTypeArr[20] = BIB_RESSTR(ST_TYPE_CUSTOM4 );
aBibTypeArr[21] = BIB_RESSTR(ST_TYPE_CUSTOM5 );
- FreeResource();
-
InitFixedTexts();
- aBasePos = aIdentifierFT.GetPosPixel();
+ aBasePos = pIdentifierFT->GetPosPixel();
sal_Int16* pMap = nFT2CtrlMap;
for( sal_uInt16 i = 0 ; i < FIELD_COUNT ; ++i, ++pMap )
@@ -264,9 +255,9 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan):
aVertScroll.SetScrollHdl( aScrollLnk );
aHoriScroll.SetLineSize(10);
aVertScroll.SetLineSize(10);
- aHoriScroll.SetPageSize( aIdentifierFT.GetSizePixel().Width());
+ aHoriScroll.SetPageSize( pIdentifierFT->GetSizePixel().Width());
aVertScroll.SetPageSize(
- aPublisherFT.GetPosPixel().Y() - aIdentifierFT.GetPosPixel().Y());
+ pPublisherFT->GetPosPixel().Y() - pIdentifierFT->GetPosPixel().Y());
aHoriScroll.Show();
aVertScroll.Show();
@@ -277,111 +268,111 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan):
aDesc.nCommandType = CommandType::TABLE;
const Mapping* pMapping = pBibConfig->GetMapping(aDesc);
- xCtrlContnr = VCLUnoHelper::CreateControlContainer(&aControlParentWin);
+ xCtrlContnr = VCLUnoHelper::CreateControlContainer(this);
// the control should be a bit smaller than the fixed text
- Size aControlSize(aIdentifierFT.GetSizePixel());
+ Size aControlSize(pIdentifierFT->GetSizePixel());
aControlSize.Width() = aControlSize.Width() * 8 / 10;
- AddControlWithError( lcl_GetColumnName( pMapping, IDENTIFIER_POS ), lcl_MovePoint( aIdentifierFT ),
- aControlSize, sTableErrorString, aIdentifierFT.GetText(),
+ AddControlWithError( lcl_GetColumnName( pMapping, IDENTIFIER_POS ), lcl_MovePoint( *pIdentifierFT ),
+ aControlSize, sTableErrorString, pIdentifierFT->GetText(),
HID_BIB_IDENTIFIER_POS, 0 );
sTypeColumnName = lcl_GetColumnName(pMapping, AUTHORITYTYPE_POS);
- AddControlWithError( sTypeColumnName, lcl_MovePoint(aAuthTypeFT ), aControlSize, sTableErrorString,
- aAuthTypeFT.GetText(), HID_BIB_AUTHORITYTYPE_POS, 1 );
+ AddControlWithError( sTypeColumnName, lcl_MovePoint(*pAuthTypeFT ), aControlSize, sTableErrorString,
+ pAuthTypeFT->GetText(), HID_BIB_AUTHORITYTYPE_POS, 1 );
- ::Point aYearPos = lcl_MovePoint(aYearFT);
+ ::Point aYearPos = lcl_MovePoint(*pYearFT);
AddControlWithError( lcl_GetColumnName( pMapping, YEAR_POS ), aYearPos,
- aControlSize, sTableErrorString, aYearFT.GetText(), HID_BIB_YEAR_POS, 4 );
+ aControlSize, sTableErrorString, pYearFT->GetText(), HID_BIB_YEAR_POS, 4 );
- AddControlWithError( lcl_GetColumnName(pMapping, AUTHOR_POS), lcl_MovePoint(aAuthorFT),
- aControlSize, sTableErrorString, aAuthorFT.GetText(), HID_BIB_AUTHOR_POS, 2 );
+ AddControlWithError( lcl_GetColumnName(pMapping, AUTHOR_POS), lcl_MovePoint(*pAuthorFT),
+ aControlSize, sTableErrorString, pAuthorFT->GetText(), HID_BIB_AUTHOR_POS, 2 );
- ::Point aTitlePos( lcl_MovePoint( aTitleFT ) );
- ::Size aTitleSize = aTitleFT.GetSizePixel();
+ ::Point aTitlePos( lcl_MovePoint( *pTitleFT ) );
+ ::Size aTitleSize = pTitleFT->GetSizePixel();
aTitleSize.Width() = aYearPos.X() + aControlSize.Width() - aTitlePos.X();
AddControlWithError( lcl_GetColumnName(pMapping, TITLE_POS), aTitlePos, aTitleSize, sTableErrorString,
- aTitleFT.GetText(), HID_BIB_TITLE_POS, 22 );
+ pTitleFT->GetText(), HID_BIB_TITLE_POS, 22 );
- AddControlWithError( lcl_GetColumnName( pMapping, PUBLISHER_POS ), lcl_MovePoint( aPublisherFT),
- aControlSize, sTableErrorString, aPublisherFT.GetText(), HID_BIB_PUBLISHER_POS, 5 );
+ AddControlWithError( lcl_GetColumnName( pMapping, PUBLISHER_POS ), lcl_MovePoint( *pPublisherFT),
+ aControlSize, sTableErrorString, pPublisherFT->GetText(), HID_BIB_PUBLISHER_POS, 5 );
- AddControlWithError( lcl_GetColumnName( pMapping, ADDRESS_POS ), lcl_MovePoint( aAddressFT ),
- aControlSize, sTableErrorString, aAddressFT.GetText(), HID_BIB_ADDRESS_POS, 7 );
+ AddControlWithError( lcl_GetColumnName( pMapping, ADDRESS_POS ), lcl_MovePoint( *pAddressFT ),
+ aControlSize, sTableErrorString, pAddressFT->GetText(), HID_BIB_ADDRESS_POS, 7 );
- AddControlWithError( lcl_GetColumnName( pMapping, ISBN_POS ), lcl_MovePoint( aISBNFT ),
- aControlSize, sTableErrorString, aISBNFT.GetText(), HID_BIB_ISBN_POS, 6 );
+ AddControlWithError( lcl_GetColumnName( pMapping, ISBN_POS ), lcl_MovePoint( *pISBNFT ),
+ aControlSize, sTableErrorString, pISBNFT->GetText(), HID_BIB_ISBN_POS, 6 );
- AddControlWithError( lcl_GetColumnName( pMapping, CHAPTER_POS ), lcl_MovePoint(aChapterFT),
- aControlSize, sTableErrorString, aChapterFT.GetText(), HID_BIB_CHAPTER_POS, 10 );
+ AddControlWithError( lcl_GetColumnName( pMapping, CHAPTER_POS ), lcl_MovePoint(*pChapterFT),
+ aControlSize, sTableErrorString, pChapterFT->GetText(), HID_BIB_CHAPTER_POS, 10 );
- AddControlWithError( lcl_GetColumnName( pMapping, PAGES_POS ), lcl_MovePoint( aPagesFT ),
- aControlSize, sTableErrorString, aPagesFT.GetText(), HID_BIB_PAGES_POS, 19 );
+ AddControlWithError( lcl_GetColumnName( pMapping, PAGES_POS ), lcl_MovePoint( *pPagesFT ),
+ aControlSize, sTableErrorString, pPagesFT->GetText(), HID_BIB_PAGES_POS, 19 );
- AddControlWithError( lcl_GetColumnName( pMapping, EDITOR_POS ), lcl_MovePoint( aEditorFT ),
- aControlSize, sTableErrorString, aEditorFT.GetText(), HID_BIB_EDITOR_POS, 12 );
+ AddControlWithError( lcl_GetColumnName( pMapping, EDITOR_POS ), lcl_MovePoint( *pEditorFT ),
+ aControlSize, sTableErrorString, pEditorFT->GetText(), HID_BIB_EDITOR_POS, 12 );
- AddControlWithError( lcl_GetColumnName( pMapping, EDITION_POS ), lcl_MovePoint(aEditionFT),
- aControlSize, sTableErrorString, aEditionFT.GetText(), HID_BIB_EDITION_POS, 11 );
+ AddControlWithError( lcl_GetColumnName( pMapping, EDITION_POS ), lcl_MovePoint(*pEditionFT),
+ aControlSize, sTableErrorString, pEditionFT->GetText(), HID_BIB_EDITION_POS, 11 );
- AddControlWithError( lcl_GetColumnName(pMapping, BOOKTITLE_POS), lcl_MovePoint(aBooktitleFT),
- aControlSize, sTableErrorString, aBooktitleFT.GetText(), HID_BIB_BOOKTITLE_POS, 9 );
+ AddControlWithError( lcl_GetColumnName(pMapping, BOOKTITLE_POS), lcl_MovePoint(*pBooktitleFT),
+ aControlSize, sTableErrorString, pBooktitleFT->GetText(), HID_BIB_BOOKTITLE_POS, 9 );
- AddControlWithError( lcl_GetColumnName( pMapping, VOLUME_POS ), lcl_MovePoint( aVolumeFT ),
- aControlSize, sTableErrorString, aVolumeFT.GetText(), HID_BIB_VOLUME_POS, 24 );
+ AddControlWithError( lcl_GetColumnName( pMapping, VOLUME_POS ), lcl_MovePoint( *pVolumeFT ),
+ aControlSize, sTableErrorString, pVolumeFT->GetText(), HID_BIB_VOLUME_POS, 24 );
- AddControlWithError( lcl_GetColumnName( pMapping, HOWPUBLISHED_POS ), lcl_MovePoint( aHowpublishedFT ),
- aControlSize, sTableErrorString, aHowpublishedFT.GetText(), HID_BIB_HOWPUBLISHED_POS, 13 );
+ AddControlWithError( lcl_GetColumnName( pMapping, HOWPUBLISHED_POS ), lcl_MovePoint( *pHowpublishedFT ),
+ aControlSize, sTableErrorString, pHowpublishedFT->GetText(), HID_BIB_HOWPUBLISHED_POS, 13 );
- AddControlWithError( lcl_GetColumnName( pMapping, ORGANIZATIONS_POS ), lcl_MovePoint( aOrganizationsFT ),
- aControlSize, sTableErrorString, aOrganizationsFT.GetText(), HID_BIB_ORGANIZATIONS_POS, 18 );
+ AddControlWithError( lcl_GetColumnName( pMapping, ORGANIZATIONS_POS ), lcl_MovePoint( *pOrganizationsFT ),
+ aControlSize, sTableErrorString, pOrganizationsFT->GetText(), HID_BIB_ORGANIZATIONS_POS, 18 );
- AddControlWithError( lcl_GetColumnName( pMapping, INSTITUTION_POS ), lcl_MovePoint( aInstitutionFT ),
- aControlSize, sTableErrorString, aInstitutionFT.GetText(), HID_BIB_INSTITUTION_POS, 14 );
+ AddControlWithError( lcl_GetColumnName( pMapping, INSTITUTION_POS ), lcl_MovePoint( *pInstitutionFT ),
+ aControlSize, sTableErrorString, pInstitutionFT->GetText(), HID_BIB_INSTITUTION_POS, 14 );
- AddControlWithError( lcl_GetColumnName( pMapping, SCHOOL_POS ), lcl_MovePoint( aSchoolFT ),
- aControlSize, sTableErrorString, aSchoolFT.GetText(), HID_BIB_SCHOOL_POS, 20 );
+ AddControlWithError( lcl_GetColumnName( pMapping, SCHOOL_POS ), lcl_MovePoint( *pSchoolFT ),
+ aControlSize, sTableErrorString, pSchoolFT->GetText(), HID_BIB_SCHOOL_POS, 20 );
- AddControlWithError( lcl_GetColumnName( pMapping, REPORTTYPE_POS ), lcl_MovePoint( aReportTypeFT ),
- aControlSize, sTableErrorString, aReportTypeFT.GetText(), HID_BIB_REPORTTYPE_POS, 23 );
+ AddControlWithError( lcl_GetColumnName( pMapping, REPORTTYPE_POS ), lcl_MovePoint( *pReportTypeFT ),
+ aControlSize, sTableErrorString, pReportTypeFT->GetText(), HID_BIB_REPORTTYPE_POS, 23 );
- AddControlWithError( lcl_GetColumnName( pMapping, MONTH_POS ), lcl_MovePoint( aMonthFT ),
- aControlSize, sTableErrorString, aMonthFT.GetText(), HID_BIB_MONTH_POS, 3 );
+ AddControlWithError( lcl_GetColumnName( pMapping, MONTH_POS ), lcl_MovePoint( *pMonthFT ),
+ aControlSize, sTableErrorString, pMonthFT->GetText(), HID_BIB_MONTH_POS, 3 );
- AddControlWithError( lcl_GetColumnName( pMapping, JOURNAL_POS ), lcl_MovePoint( aJournalFT ),
- aControlSize, sTableErrorString, aJournalFT.GetText(), HID_BIB_JOURNAL_POS, 15 );
+ AddControlWithError( lcl_GetColumnName( pMapping, JOURNAL_POS ), lcl_MovePoint( *pJournalFT ),
+ aControlSize, sTableErrorString, pJournalFT->GetText(), HID_BIB_JOURNAL_POS, 15 );
- AddControlWithError( lcl_GetColumnName( pMapping, NUMBER_POS ), lcl_MovePoint( aNumberFT ),
- aControlSize, sTableErrorString, aNumberFT.GetText(), HID_BIB_NUMBER_POS, 17 );
+ AddControlWithError( lcl_GetColumnName( pMapping, NUMBER_POS ), lcl_MovePoint( *pNumberFT ),
+ aControlSize, sTableErrorString, pNumberFT->GetText(), HID_BIB_NUMBER_POS, 17 );
- AddControlWithError( lcl_GetColumnName( pMapping, SERIES_POS ), lcl_MovePoint( aSeriesFT ),
- aControlSize, sTableErrorString, aSeriesFT.GetText(), HID_BIB_SERIES_POS, 21 );
+ AddControlWithError( lcl_GetColumnName( pMapping, SERIES_POS ), lcl_MovePoint( *pSeriesFT ),
+ aControlSize, sTableErrorString, pSeriesFT->GetText(), HID_BIB_SERIES_POS, 21 );
- AddControlWithError( lcl_GetColumnName( pMapping, ANNOTE_POS ), lcl_MovePoint( aAnnoteFT ),
- aControlSize, sTableErrorString, aAnnoteFT.GetText(), HID_BIB_ANNOTE_POS, 8 );
+ AddControlWithError( lcl_GetColumnName( pMapping, ANNOTE_POS ), lcl_MovePoint( *pAnnoteFT ),
+ aControlSize, sTableErrorString, pAnnoteFT->GetText(), HID_BIB_ANNOTE_POS, 8 );
- AddControlWithError( lcl_GetColumnName( pMapping, NOTE_POS ), lcl_MovePoint( aNoteFT ),
- aControlSize, sTableErrorString, aNoteFT.GetText(), HID_BIB_NOTE_POS, 16 );
+ AddControlWithError( lcl_GetColumnName( pMapping, NOTE_POS ), lcl_MovePoint( *pNoteFT ),
+ aControlSize, sTableErrorString, pNoteFT->GetText(), HID_BIB_NOTE_POS, 16 );
- AddControlWithError( lcl_GetColumnName( pMapping, URL_POS ), lcl_MovePoint( aURLFT ),
- aControlSize, sTableErrorString, aURLFT.GetText(), HID_BIB_URL_POS, 25 );
+ AddControlWithError( lcl_GetColumnName( pMapping, URL_POS ), lcl_MovePoint( *pURLFT ),
+ aControlSize, sTableErrorString, pURLFT->GetText(), HID_BIB_URL_POS, 25 );
- AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM1_POS ), lcl_MovePoint( aCustom1FT ),
- aControlSize, sTableErrorString, aCustom1FT.GetText(), HID_BIB_CUSTOM1_POS, 26 );
+ AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM1_POS ), lcl_MovePoint( *pCustom1FT ),
+ aControlSize, sTableErrorString, pCustom1FT->GetText(), HID_BIB_CUSTOM1_POS, 26 );
- AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM2_POS ), lcl_MovePoint( aCustom2FT ),
- aControlSize, sTableErrorString, aCustom2FT.GetText(), HID_BIB_CUSTOM2_POS, 27 );
+ AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM2_POS ), lcl_MovePoint( *pCustom2FT ),
+ aControlSize, sTableErrorString, pCustom2FT->GetText(), HID_BIB_CUSTOM2_POS, 27 );
- AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM3_POS ), lcl_MovePoint( aCustom3FT ),
- aControlSize, sTableErrorString, aCustom3FT.GetText(), HID_BIB_CUSTOM3_POS, 28 );
+ AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM3_POS ), lcl_MovePoint( *pCustom3FT ),
+ aControlSize, sTableErrorString, pCustom3FT->GetText(), HID_BIB_CUSTOM3_POS, 28 );
- AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM4_POS ), lcl_MovePoint( aCustom4FT ),
- aControlSize, sTableErrorString, aCustom4FT.GetText(), HID_BIB_CUSTOM4_POS, 29 );
+ AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM4_POS ), lcl_MovePoint( *pCustom4FT ),
+ aControlSize, sTableErrorString, pCustom4FT->GetText(), HID_BIB_CUSTOM4_POS, 29 );
- AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM5_POS ), lcl_MovePoint( aCustom5FT ),
- aControlSize, sTableErrorString, aCustom5FT.GetText(), HID_BIB_CUSTOM5_POS, 30 );
+ AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM5_POS ), lcl_MovePoint( *pCustom5FT ),
+ aControlSize, sTableErrorString, pCustom5FT->GetText(), HID_BIB_CUSTOM5_POS, 30 );
xPosListener = new BibPosListener(this);
uno::Reference< sdbc::XRowSet > xRowSet(pDatMan->getForm(), UNO_QUERY);
@@ -393,6 +384,8 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan):
if(!sTableErrorString.isEmpty())
sTableErrorString = sErrorPrefix + sTableErrorString;
+
+ SetText(BIB_RESSTR(ST_TYPE_TITLE));
}
BibGeneralPage::~BibGeneralPage()
@@ -403,6 +396,38 @@ BibGeneralPage::~BibGeneralPage()
if(xRowSet.is())
xRowSet->removeRowSetListener(xPosListener);
}
+
+ delete pIdentifierFT;
+ delete pAuthTypeFT;
+ delete pYearFT;
+ delete pAuthorFT;
+ delete pTitleFT;
+ delete pPublisherFT;
+ delete pAddressFT;
+ delete pISBNFT;
+ delete pChapterFT;
+ delete pPagesFT;
+ delete pEditorFT;
+ delete pEditionFT;
+ delete pBooktitleFT;
+ delete pVolumeFT;
+ delete pHowpublishedFT;
+ delete pOrganizationsFT;
+ delete pInstitutionFT;
+ delete pSchoolFT;
+ delete pReportTypeFT;
+ delete pMonthFT;
+ delete pJournalFT;
+ delete pNumberFT;
+ delete pSeriesFT;
+ delete pAnnoteFT;
+ delete pNoteFT;
+ delete pURLFT;
+ delete pCustom1FT;
+ delete pCustom2FT;
+ delete pCustom3FT;
+ delete pCustom4FT;
+ delete pCustom5FT;
}
void BibGeneralPage::RemoveListeners()
@@ -602,7 +627,7 @@ void BibGeneralPage::AdjustScrollbars()
aControlParentWinSz.Height() -= aSize.Height();
if(bVertVisible)
aControlParentWinSz.Width() -= aSize.Width();
- aControlParentWin.SetSizePixel(aControlParentWinSz);
+ SetSizePixel(aControlParentWinSz);
}
void BibGeneralPage::Resize()
@@ -650,37 +675,37 @@ void BibGeneralPage::InitFixedTexts( void )
BIB_RESSTR( ST_CUSTOM5 )
};
- aFixedTexts[0] = &aIdentifierFT;
- aFixedTexts[1] = &aAuthTypeFT;
- aFixedTexts[2] = &aAuthorFT;
- aFixedTexts[3] = &aTitleFT;
- aFixedTexts[4] = &aMonthFT;
- aFixedTexts[5] = &aYearFT;
- aFixedTexts[6] = &aISBNFT;
- aFixedTexts[7] = &aBooktitleFT;
- aFixedTexts[8] = &aChapterFT;
- aFixedTexts[9] = &aEditionFT;
- aFixedTexts[10] = &aEditorFT;
- aFixedTexts[11] = &aHowpublishedFT;
- aFixedTexts[12] = &aInstitutionFT;
- aFixedTexts[13] = &aJournalFT;
- aFixedTexts[14] = &aNoteFT;
- aFixedTexts[15] = &aAnnoteFT;
- aFixedTexts[16] = &aNumberFT;
- aFixedTexts[17] = &aOrganizationsFT;
- aFixedTexts[18] = &aPagesFT;
- aFixedTexts[19] = &aPublisherFT;
- aFixedTexts[20] = &aAddressFT;
- aFixedTexts[21] = &aSchoolFT;
- aFixedTexts[22] = &aSeriesFT;
- aFixedTexts[23] = &aReportTypeFT;
- aFixedTexts[24] = &aVolumeFT;
- aFixedTexts[25] = &aURLFT;
- aFixedTexts[26] = &aCustom1FT;
- aFixedTexts[27] = &aCustom2FT;
- aFixedTexts[28] = &aCustom3FT;
- aFixedTexts[29] = &aCustom4FT;
- aFixedTexts[30] = &aCustom5FT;
+ aFixedTexts[0] = pIdentifierFT;
+ aFixedTexts[1] = pAuthTypeFT;
+ aFixedTexts[2] = pAuthorFT;
+ aFixedTexts[3] = pTitleFT;
+ aFixedTexts[4] = pMonthFT;
+ aFixedTexts[5] = pYearFT;
+ aFixedTexts[6] = pISBNFT;
+ aFixedTexts[7] = pBooktitleFT;
+ aFixedTexts[8] = pChapterFT;
+ aFixedTexts[9] = pEditionFT;
+ aFixedTexts[10] = pEditorFT;
+ aFixedTexts[11] = pHowpublishedFT;
+ aFixedTexts[12] = pInstitutionFT;
+ aFixedTexts[13] = pJournalFT;
+ aFixedTexts[14] = pNoteFT;
+ aFixedTexts[15] = pAnnoteFT;
+ aFixedTexts[16] = pNumberFT;
+ aFixedTexts[17] = pOrganizationsFT;
+ aFixedTexts[18] = pPagesFT;
+ aFixedTexts[19] = pPublisherFT;
+ aFixedTexts[20] = pAddressFT;
+ aFixedTexts[21] = pSchoolFT;
+ aFixedTexts[22] = pSeriesFT;
+ aFixedTexts[23] = pReportTypeFT;
+ aFixedTexts[24] = pVolumeFT;
+ aFixedTexts[25] = pURLFT;
+ aFixedTexts[26] = pCustom1FT;
+ aFixedTexts[27] = pCustom2FT;
+ aFixedTexts[28] = pCustom3FT;
+ aFixedTexts[29] = pCustom4FT;
+ aFixedTexts[30] = pCustom5FT;
int i;
@@ -737,7 +762,7 @@ void BibGeneralPage::focusGained(const awt::FocusEvent& rEvent) throw( uno::Runt
Reference<awt::XWindow> xCtrWin(rEvent.Source, UNO_QUERY );
if(xCtrWin.is())
{
- ::Size aOutSize = aControlParentWin.GetOutputSizePixel();
+ ::Size aOutSize = GetOutputSizePixel();
awt::Rectangle aRect = xCtrWin->getPosSize();
long nX = aRect.X;
if(nX < 0)
@@ -791,7 +816,7 @@ void BibGeneralPage::GetFocus()
}
// fallback
- aControlParentWin.GrabFocus();
+ GrabFocus();
}
bool BibGeneralPage::HandleShortCutKey( const KeyEvent& rKeyEvent )
diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx
index 526319f..169cda6 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -44,51 +44,47 @@ typedef cppu::WeakAggImplHelper1 < ::com::sun::star::awt::XFocusListener > BibGe
class BibGeneralPage: public BibGeneralPageBaseClass, public BibTabPage
{
- Window aControlParentWin;
- FixedText aIdentifierFT;
- FixedText aAuthTypeFT;
- FixedText aYearFT;
-
- FixedText aAuthorFT;
- FixedText aTitleFT;
-
- FixedText aPublisherFT;
- FixedText aAddressFT;
- FixedText aISBNFT;
-
- FixedText aChapterFT;
- FixedText aPagesFT;
- FixedLine aFirstFL;
-
- FixedText aEditorFT;
- FixedText aEditionFT;
-
- FixedText aBooktitleFT;
- FixedText aVolumeFT;
- FixedText aHowpublishedFT;
-
- FixedText aOrganizationsFT;
- FixedText aInstitutionFT;
- FixedText aSchoolFT;
-
- FixedText aReportTypeFT;
- FixedText aMonthFT;
- FixedLine aSecondFL;
-
- FixedText aJournalFT;
- FixedText aNumberFT;
- FixedText aSeriesFT;
-
- FixedText aAnnoteFT;
- FixedText aNoteFT;
- FixedText aURLFT;
- FixedLine aThirdFL;
-
- FixedText aCustom1FT;
- FixedText aCustom2FT;
- FixedText aCustom3FT;
- FixedText aCustom4FT;
- FixedText aCustom5FT;
+ FixedText* pIdentifierFT;
+ FixedText* pAuthTypeFT;
+ FixedText* pYearFT;
+
+ FixedText* pAuthorFT;
+ FixedText* pTitleFT;
+
+ FixedText* pPublisherFT;
+ FixedText* pAddressFT;
+ FixedText* pISBNFT;
+
+ FixedText* pChapterFT;
+ FixedText* pPagesFT;
+
+ FixedText* pEditorFT;
+ FixedText* pEditionFT;
+
+ FixedText* pBooktitleFT;
+ FixedText* pVolumeFT;
+ FixedText* pHowpublishedFT;
+
+ FixedText* pOrganizationsFT;
+ FixedText* pInstitutionFT;
+ FixedText* pSchoolFT;
+
+ FixedText* pReportTypeFT;
+ FixedText* pMonthFT;
+
+ FixedText* pJournalFT;
+ FixedText* pNumberFT;
+ FixedText* pSeriesFT;
+
+ FixedText* pAnnoteFT;
+ FixedText* pNoteFT;
+ FixedText* pURLFT;
+
+ FixedText* pCustom1FT;
+ FixedText* pCustom2FT;
+ FixedText* pCustom3FT;
+ FixedText* pCustom4FT;
+ FixedText* pCustom5FT;
ScrollBar aHoriScroll;
ScrollBar aVertScroll;
diff --git a/extensions/source/bibliography/sections.hrc b/extensions/source/bibliography/sections.hrc
deleted file mode 100644
index 9d04056..0000000
--- a/extensions/source/bibliography/sections.hrc
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "bib.hrc"
-
-//General
-#define FT_IDENTIFIER 1
-#define FT_AUTHTYPE 2
-#define FT_AUTHOR 3
-#define FT_YEAR 4
-#define FT_ISBN 5
-
-#define FT_MONTH 6
-
-#define FT_PUBLISHER 8
-
-#define FT_ADDRESS 9
-#define FT_ANNOTE 10
-#define FT_BOOKTITLE 11
-#define FT_CHAPTER 12
-#define FT_EDITION 13
-#define FT_EDITOR 14
-#define FT_HOWPUBLISHED 15
-#define FT_INSTITUTION 16
-#define FT_JOURNAL 17
-#define FT_NOTE 18
-#define FT_NUMBER 19
-#define FT_ORGANIZATION 20
-#define FT_PAGE 21
-#define FT_SCHOOL 22
-#define FT_SERIES 23
-#define FT_TITLE 24
-#define FT_REPORT 25
-#define FT_VOLUME 26
-#define FT_URL 27
-#define FT_CUSTOM1 28
-#define FT_CUSTOM2 29
-#define FT_CUSTOM3 30
-#define FT_CUSTOM4 31
-#define FT_CUSTOM5 32
-#define ST_ERROR_PREFIX 33
-#define FL_1 34
-#define FL_2 35
-#define FL_3 36
-
-#define ST_TYPE_ARTICLE 40
-#define ST_TYPE_BOOK 41
-#define ST_TYPE_BOOKLET 42
-#define ST_TYPE_CONFERENCE 43
-#define ST_TYPE_INBOOK 44
-#define ST_TYPE_INCOLLECTION 45
-#define ST_TYPE_INPROCEEDINGS 46
-#define ST_TYPE_JOURNAL 47
-#define ST_TYPE_MANUAL 48
-#define ST_TYPE_MASTERSTHESIS 49
-#define ST_TYPE_MISC 50
-#define ST_TYPE_PHDTHESIS 51
-#define ST_TYPE_PROCEEDINGS 52
-#define ST_TYPE_TECHREPORT 53
-#define ST_TYPE_UNPUBLISHED 54
-#define ST_TYPE_EMAIL 55
-#define ST_TYPE_WWW 56
-#define ST_TYPE_CUSTOM1 57
-#define ST_TYPE_CUSTOM2 58
-#define ST_TYPE_CUSTOM3 59
-#define ST_TYPE_CUSTOM4 60
-#define ST_TYPE_CUSTOM5 61
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/bibliography/sections.src b/extensions/source/bibliography/sections.src
index d6fbac8..e580a49 100644
--- a/extensions/source/bibliography/sections.src
+++ b/extensions/source/bibliography/sections.src
@@ -17,324 +17,104 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "sections.hrc"
-#include "bibliography.hrc"
-#define FT_POS 12
-#define FTSIZE_LEFT 88
-#define ED_POS_LEFT FT_POS+FTSIZE_LEFT+1
-#define ED_SIZE 70
-#define ED_POS_LEFT2 ED_POS_LEFT + ED_SIZE +1
-#define FT_POS_MIDDLE ED_POS_LEFT2 + 5
-#define FT_POS_RIGHT FT_POS_MIDDLE + FT_POS_MIDDLE - FT_POS
-
-#define FL_POS 6
-#define PAGE_WIDTH FT_POS_RIGHT + FTSIZE_LEFT + (FTSIZE_LEFT * 8 / 10) + FL_POS + 5
-#define FL_WIDTH PAGE_WIDTH - 2 * FL_POS
-
-TabPage RID_TP_GENERAL
+#include "bib.hrc"
+String ST_ERROR_PREFIX
+{
+ Text [ en-US ] = "The following column names could not be assigned:\n";
+};
+String ST_TYPE_ARTICLE
+{
+ Text [ en-US ] = "Article";
+};
+String ST_TYPE_BOOK
+{
+ Text [ en-US ] = "Book";
+};
+String ST_TYPE_BOOKLET
+{
+ Text [ en-US ] = "Brochures";
+};
+String ST_TYPE_CONFERENCE
+{
+ Text [ en-US ] = "Conference proceedings";
+};
+String ST_TYPE_INBOOK
+{
+ Text [ en-US ] = "Book excerpt";
+};
+String ST_TYPE_INCOLLECTION
+{
+ Text [ en-US ] = "Book excerpt with title";
+};
+String ST_TYPE_INPROCEEDINGS
+{
+ Text [ en-US ] = "Conference proceedings";
+};
+String ST_TYPE_JOURNAL
+{
+ Text [ en-US ] = "Journal";
+};
+String ST_TYPE_MANUAL
+{
+ Text [ en-US ] = "Techn. documentation";
+};
+String ST_TYPE_MASTERSTHESIS
+{
+ Text [ en-US ] = "Thesis";
+};
+String ST_TYPE_MISC
+{
+ Text [ en-US ] = "Miscellaneous";
+};
+String ST_TYPE_PHDTHESIS
+{
+ Text [ en-US ] = "Dissertation";
+};
+String ST_TYPE_PROCEEDINGS
+{
+ Text [ en-US ] = "Conference proceedings";
+};
+String ST_TYPE_TECHREPORT
+{
+ Text [ en-US ] = "Research report";
+};
+String ST_TYPE_UNPUBLISHED
+{
+ Text [ en-US ] = "Unpublished";
+};
+String ST_TYPE_EMAIL
+{
+ Text [ en-US ] = "e-mail";
+};
+String ST_TYPE_WWW
+{
+ Text [ en-US ] = "WWW document";
+};
+String ST_TYPE_CUSTOM1
+{
+ Text [ en-US ] = "User-defined1";
+};
+String ST_TYPE_CUSTOM2
+{
+ Text [ en-US ] = "User-defined2";
+};
+String ST_TYPE_CUSTOM3
+{
+ Text [ en-US ] = "User-defined3";
+};
+String ST_TYPE_CUSTOM4
+{
+ Text [ en-US ] = "User-defined4";
+};
+String ST_TYPE_CUSTOM5
+{
+ Text [ en-US ] = "User-defined5";
+};
+String ST_TYPE_TITLE
{
- SVLook = TRUE ;
- Size = MAP_APPFONT( PAGE_WIDTH, 209 );
- HelpId = HID_BIB_CONTROL_PAGE;
-
- FixedText FT_IDENTIFIER
- {
- Pos = MAP_APPFONT( FT_POS, 6 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedText FT_AUTHTYPE
- {
- Pos = MAP_APPFONT( FT_POS_MIDDLE, 6 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedText FT_YEAR
- {
- Pos = MAP_APPFONT( FT_POS_RIGHT, 6 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedText FT_AUTHOR
- {
- Pos = MAP_APPFONT( FT_POS, 20 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedText FT_TITLE
- {
- Pos = MAP_APPFONT( FT_POS_MIDDLE, 20 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedText FT_PUBLISHER
- {
- Pos = MAP_APPFONT( FT_POS, 34 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedText FT_ADDRESS
- {
- Pos = MAP_APPFONT( FT_POS_MIDDLE, 34 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedText FT_ISBN
- {
- Pos = MAP_APPFONT( FT_POS_RIGHT, 34 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedText FT_CHAPTER
- {
- Pos = MAP_APPFONT( FT_POS, 48 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedText FT_PAGE
- {
- Pos = MAP_APPFONT( FT_POS_MIDDLE, 48 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedLine FL_1
- {
- Pos = MAP_APPFONT( FL_POS, 62 );
- Size = MAP_APPFONT( FL_WIDTH, 8 );
- };
- FixedText FT_EDITOR
- {
- Pos = MAP_APPFONT( FT_POS, 73 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedText FT_EDITION
- {
- Pos = MAP_APPFONT( FT_POS_MIDDLE, 73 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedText FT_BOOKTITLE
- {
- Pos = MAP_APPFONT( FT_POS, 87 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedText FT_VOLUME
- {
- Pos = MAP_APPFONT( FT_POS_MIDDLE, 87 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedText FT_HOWPUBLISHED
- {
- Pos = MAP_APPFONT( FT_POS_RIGHT, 87 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedText FT_ORGANIZATION
- {
- Pos = MAP_APPFONT( FT_POS, 101 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedText FT_INSTITUTION
- {
- Pos = MAP_APPFONT( FT_POS_MIDDLE, 101 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedText FT_SCHOOL
- {
- Pos = MAP_APPFONT( FT_POS_RIGHT, 101 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedText FT_REPORT
- {
- Pos = MAP_APPFONT( FT_POS, 115);
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedText FT_MONTH
- {
- Pos = MAP_APPFONT( FT_POS_MIDDLE, 115 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedLine FL_2
- {
- Pos = MAP_APPFONT( FL_POS, 129 );
- Size = MAP_APPFONT( FL_WIDTH, 8 );
- };
- FixedText FT_JOURNAL
- {
- Pos = MAP_APPFONT( FT_POS, 140 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
-
- FixedText FT_NUMBER
- {
- Pos = MAP_APPFONT( FT_POS_MIDDLE, 140 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedText FT_SERIES
- {
- Pos = MAP_APPFONT( FT_POS_RIGHT, 140 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedText FT_ANNOTE
- {
- Pos = MAP_APPFONT( FT_POS, 154 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedText FT_NOTE
- {
- Pos = MAP_APPFONT( FT_POS_MIDDLE, 154 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedText FT_URL
- {
- Pos = MAP_APPFONT( FT_POS_RIGHT, 154 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedLine FL_3
- {
- Pos = MAP_APPFONT( FL_POS, 168 );
- Size = MAP_APPFONT( FL_WIDTH, 8 );
- };
- FixedText FT_CUSTOM1
- {
- Pos = MAP_APPFONT( FT_POS, 179 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedText FT_CUSTOM2
- {
- Pos = MAP_APPFONT( FT_POS_MIDDLE, 179 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedText FT_CUSTOM3
- {
- Pos = MAP_APPFONT( FT_POS_RIGHT, 179 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedText FT_CUSTOM4
- {
- Pos = MAP_APPFONT( FT_POS, 193 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- FixedText FT_CUSTOM5
- {
- Pos = MAP_APPFONT( FT_POS_MIDDLE, 193 );
- Size = MAP_APPFONT( FTSIZE_LEFT, 10 );
- Right = TRUE;
- };
- String ST_ERROR_PREFIX
- {
- Text [ en-US ] = "The following column names could not be assigned:\n";
- };
- String ST_TYPE_ARTICLE
- {
- Text [ en-US ] = "Article";
- };
- String ST_TYPE_BOOK
- {
- Text [ en-US ] = "Book";
- };
- String ST_TYPE_BOOKLET
- {
- Text [ en-US ] = "Brochures";
- };
- String ST_TYPE_CONFERENCE
- {
- Text [ en-US ] = "Conference proceedings";
- };
- String ST_TYPE_INBOOK
- {
- Text [ en-US ] = "Book excerpt";
- };
- String ST_TYPE_INCOLLECTION
- {
- Text [ en-US ] = "Book excerpt with title";
- };
- String ST_TYPE_INPROCEEDINGS
- {
- Text [ en-US ] = "Conference proceedings";
- };
- String ST_TYPE_JOURNAL
- {
- Text [ en-US ] = "Journal";
- };
- String ST_TYPE_MANUAL
- {
- Text [ en-US ] = "Techn. documentation";
- };
- String ST_TYPE_MASTERSTHESIS
- {
- Text [ en-US ] = "Thesis";
- };
- String ST_TYPE_MISC
- {
- Text [ en-US ] = "Miscellaneous";
- };
- String ST_TYPE_PHDTHESIS
- {
- Text [ en-US ] = "Dissertation";
- };
- String ST_TYPE_PROCEEDINGS
- {
- Text [ en-US ] = "Conference proceedings";
- };
- String ST_TYPE_TECHREPORT
- {
- Text [ en-US ] = "Research report";
- };
- String ST_TYPE_UNPUBLISHED
- {
- Text [ en-US ] = "Unpublished";
- };
- String ST_TYPE_EMAIL
- {
- Text [ en-US ] = "e-mail";
- };
- String ST_TYPE_WWW
- {
- Text [ en-US ] = "WWW document";
- };
- String ST_TYPE_CUSTOM1
- {
- Text [ en-US ] = "User-defined1";
- };
- String ST_TYPE_CUSTOM2
- {
- Text [ en-US ] = "User-defined2";
- };
- String ST_TYPE_CUSTOM3
- {
- Text [ en-US ] = "User-defined3";
- };
- String ST_TYPE_CUSTOM4
- {
- Text [ en-US ] = "User-defined4";
- };
- String ST_TYPE_CUSTOM5
- {
- Text [ en-US ] = "User-defined5";
- };
Text [ en-US ] = "General";
};
-
String ST_IDENTIFIER
{
Text [ en-US ] = "~Short name";
diff --git a/extensions/uiconfig/sbibliography/ui/generalpage.ui b/extensions/uiconfig/sbibliography/ui/generalpage.ui
new file mode 100644
index 0000000..9022620
--- /dev/null
+++ b/extensions/uiconfig/sbibliography/ui/generalpage.ui
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkBox" id="GeneralPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list