Skip to content

C
core
Kaydet (Commit) eba5e5b6 authored tarafından Palenik Mihály's avatar Palenik Mihály Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

Convert RID_TP_GENERAL tabpage to .ui 

Change-Id: I32300c3d06a8c30d8e75f343cd2af8acef7296ae
Reviewed-on: https://gerrit.libreoffice.org/10989Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst d8a7f72b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 178 additions and 449 deletions
extensions/UIConfig_sbibliography.mk
Dosyayı görüntüle @ eba5e5b6
......@@ -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 \
))
......
extensions/source/bibliography/bib.hrc
Dosyayı görüntüle @ eba5e5b6
......@@ -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
......
extensions/source/bibliography/bibcont.cxx
Dosyayı görüntüle @ eba5e5b6
......@@ -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()
{
}
......
extensions/source/bibliography/bibshortcuthandler.hxx
Dosyayı görüntüle @ eba5e5b6
......@@ -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();
};
......
extensions/source/bibliography/bibview.cxx
Dosyayı görüntüle @ eba5e5b6
......@@ -26,7 +26,6 @@
#include "datman.hxx"
#include "bibresid.hxx"
#include "bibmod.hxx"
#include "sections.hrc"
#include "bibconfig.hxx"
......
extensions/source/bibliography/general.hxx
Dosyayı görüntüle @ eba5e5b6
......@@ -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;
......
extensions/source/bibliography/sections.hrc deleted 100644 → 0
Dosyayı görüntüle @ d8a7f72b
/* -*- 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: */
extensions/source/bibliography/sections.src
Dosyayı görüntüle @ eba5e5b6
......@@ -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";
......
extensions/uiconfig/sbibliography/ui/generalpage.ui 0 → 100644
Dosyayı görüntüle @ eba5e5b6
<?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>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment