[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [conquirere] /: Change the  way institution/school is handled
From:       Jörg_Ehrichs <Joerg.Ehrichs () gmx ! de>
Date:       2011-09-30 20:47:13
Message-ID: 20110930204713.DFA9AA60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 77a8d55334ff6fdf3d64dbc08a068cbf00253547 by Jörg Ehrichs.
Committed on 30/09/2011 at 22:43.
Pushed by jehrichs into branch 'master'.

Change the  way institution/school is handled

As institution and / school is the name of the publishing organization
it is way better to use nco:publisher directly instead of creating a dumm publisher \
with a affil of unknown role that has an organization with the name of the publisher.

as nco:publisher is of type nco:Contact which is a superclass of nco:organization \
contact I'm still correct with the rdf representation.

When I do the import/export from/to BibTeX I can still assign the right values as \
every entry that has an institution/school does not allow a publisher name.

M  +2    -2    nbib/DESIGN
M  +14   -27   src/sidebar/publicationwidget.ui

http://commits.kde.org/conquirere/77a8d55334ff6fdf3d64dbc08a068cbf00253547

diff --git a/nbib/DESIGN b/nbib/DESIGN
index 78abf32..dd863d5 100644
--- a/nbib/DESIGN
+++ b/nbib/DESIGN
@@ -24,7 +24,7 @@ edition		| nbib:publication => nbib:edition
 editor		| nbib:publication => nco:editor
 eprint		| nbib:publication => nbib:eprint
 howpublished	| nbib:publication => nbib:publicationMethod
-institution	| nbib:publication => nco:publisher => nco:affillation => nco:org => \
nco:fullname +institution	| nbib:publication => nco:publisher => nco:fullname (only \
valid for techreport/manual)  journal		| nbib:publication => nbib:journalIssue => \
nbib:journal => nbib:title  month		| nbib:publication => nie:publicationDate
 note		| nbib:publication => nie:description
@@ -33,7 +33,7 @@ number		| if(nbib:Publication == Article) nbib:publication => \
nbib:journalIssue  organization	| nbib:publication => nbib:organization => \
nco:fullname (only valid for nbib:Proceedings)  pages		| nbib:pages
 publisher	| nbib:publication => nco:publisher => nco:fullname
-school		| nbib:publication => nco:publisher => nco:affillation => nco:org => \
nco:fullname (only valid for nbib:Thesis and sub classes) +school		| nbib:publication \
=> nco:publisher => nco:fullname (only valid for nbib:Thesis and sub classes)  \
series		| nbib:publication => nbib:inSeries => nie:title (only valid for nbib:Book)  \
title		| nbib:publication => nie:title  type		| nbib:publication => nbib:type (only \
                valid for nbib:Techreport)
diff --git a/src/sidebar/publicationwidget.ui b/src/sidebar/publicationwidget.ui
index 2f8f4de..c5f3c1b 100644
--- a/src/sidebar/publicationwidget.ui
+++ b/src/sidebar/publicationwidget.ui
@@ -131,17 +131,7 @@
        <item row="12" column="1">
         <widget class="ContactEdit" name="editPublisher"/>
        </item>
-       <item row="14" column="0">
-        <widget class="QLabel" name="label_28">
-         <property name="text">
-          <string>Institution:</string>
-         </property>
-         <property name="buddy">
-          <cstring>editCrossref</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="16" column="0">
+       <item row="15" column="0">
         <widget class="QLabel" name="label_27">
          <property name="text">
           <string>Organization:</string>
@@ -151,22 +141,10 @@
          </property>
         </widget>
        </item>
-       <item row="16" column="1">
+       <item row="15" column="1">
         <widget class="OrganizationEdit" name="editOrganization"/>
        </item>
-       <item row="21" column="1">
-        <widget class="FileObjectEdit" name="editFileObject"/>
-       </item>
-       <item row="23" column="1">
-        <widget class="FileObjectEdit" name="editRemoteObject"/>
-       </item>
-       <item row="14" column="1">
-        <widget class="StringEdit" name="editInstitution"/>
-       </item>
-       <item row="19" column="1">
-        <widget class="StringEdit" name="editCrossref"/>
-       </item>
-       <item row="19" column="0">
+       <item row="18" column="0">
         <widget class="QLabel" name="label_18">
          <property name="text">
           <string>Crossref:</string>
@@ -176,7 +154,10 @@
          </property>
         </widget>
        </item>
-       <item row="21" column="0">
+       <item row="18" column="1">
+        <widget class="StringEdit" name="editCrossref"/>
+       </item>
+       <item row="20" column="0">
         <widget class="QLabel" name="label_25">
          <property name="text">
           <string>File:</string>
@@ -186,7 +167,10 @@
          </property>
         </widget>
        </item>
-       <item row="23" column="0">
+       <item row="20" column="1">
+        <widget class="FileObjectEdit" name="editFileObject"/>
+       </item>
+       <item row="22" column="0">
         <widget class="QLabel" name="label_16">
          <property name="text">
           <string>Remote File:</string>
@@ -196,6 +180,9 @@
          </property>
         </widget>
        </item>
+       <item row="22" column="1">
+        <widget class="FileObjectEdit" name="editRemoteObject"/>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_2">


[prev in list] [next in list] [prev in thread] [next in thread]