Commit 971bfcd7 authored by Matthias Fechner's avatar Matthias Fechner

Update to r529276.

parent b3cc2636
# $FreeBSD: head/archivers/Makefile 526263 2020-02-16 12:34:44Z rene $
# $FreeBSD: head/archivers/Makefile 529236 2020-03-27 09:40:04Z makc $
#
COMMENT = Archivers
......@@ -52,6 +52,7 @@
SUBDIR += lha
SUBDIR += lha-ac
SUBDIR += lhasa
SUBDIR += lib1541img
SUBDIR += libarc
SUBDIR += libarchive
SUBDIR += libcabinet
......@@ -242,6 +243,7 @@
SUBDIR += upx
SUBDIR += urbackup-client
SUBDIR += urbackup-server
SUBDIR += v1541commander
SUBDIR += xar
SUBDIR += xarchive
SUBDIR += xarchiver
......
# Created by: Felix Palmen <felix@palmen-it.de>
# $FreeBSD: head/archivers/lib1541img/Makefile 529236 2020-03-27 09:40:04Z makc $
PORTNAME= lib1541img
PORTVERSION= 1.1
CATEGORIES= archivers devel emulators
MAINTAINER= felix@palmen-it.de
COMMENT= Library for handling commodore 1541 disk images
LICENSE= BSD2CLAUSE
USES= gmake
USE_GITHUB= yes
GH_PROJECT= ${PORTNAME} zimk:zimk
GH_ACCOUNT= excess-c64 Zirias:zimk
GH_TAGNAME= v${PORTVERSION} 31500ca:zimk
USE_LDCONFIG= yes
MAKE_ARGS= pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \
1541img_DOCDIR=${LOCALBASE}/share/doc/lib1541img \
V=1
ALL_TARGET= strip
OPTIONS_DEFINE= DOXYGEN
OPTIONS_SUB= yes
DOXYGEN_BUILD_DEPENDS= doxygen>0:devel/doxygen
DOXYGEN_ALL_TARGET= html
post-extract:
@${MV} ${WRKDIR}/zimk-*/* ${WRKSRC}/zimk/
.include <bsd.port.mk>
TIMESTAMP = 1581093812
SHA256 (excess-c64-lib1541img-1.1-v1.1_GH0.tar.gz) = 360976364c98d64485f8f7aa5630aa7f6f4907e9128bd293c94fbcd2471c0bef
SIZE (excess-c64-lib1541img-1.1-v1.1_GH0.tar.gz) = 73253
SHA256 (Zirias-zimk-31500ca_GH0.tar.gz) = e0404e600343460320a41efdec3b432fe7bce76518b08225e01264937b0958ea
SIZE (Zirias-zimk-31500ca_GH0.tar.gz) = 12137
lib1541img is a library for creating and manipulating commodore 1541 disk
images. It also supports compressing and extracting to/from "zipcode".
WWW: https://github.com/excess-c64/lib1541img
This diff is collapsed.
# Created by: Felix Palmen <felix@palmen-it.de>
# $FreeBSD: head/archivers/v1541commander/Makefile 529236 2020-03-27 09:40:04Z makc $
PORTNAME= v1541commander
PORTVERSION= 1.1
CATEGORIES= archivers emulators
MAINTAINER= felix@palmen-it.de
COMMENT= Virtual 1541 disk commander
LICENSE= BSD2CLAUSE STYLEFONT
LICENSE_COMB= multi
LICENSE_NAME_STYLEFONT= The STYLE C64 TrueType Fonts License
LICENSE_FILE_STYLEFONT= ${WRKSRC}/LICENSE-font.txt
LICENSE_PERMS_STYLEFONT= dist-mirror no-dist-sell pkg-mirror \
no-pkg-sell auto-accept
LIB_DEPENDS= lib1541img.so:archivers/lib1541img
USES= gmake pkgconfig qt:5 shared-mime-info
USE_QT= core gui network widgets buildtools_build linguisttools_build
USE_GITHUB= yes
GH_PROJECT= ${PORTNAME} zimk:zimk
GH_ACCOUNT= excess-c64 Zirias:zimk
GH_TAGNAME= v${PORTVERSION} 31500ca:zimk
OPTIONS_DEFINE= DOCS
MAKE_ARGS= pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \
V=1
ALL_TARGET= strip
post-extract:
@${MV} ${WRKDIR}/zimk-*/* ${WRKSRC}/zimk/
.include <bsd.port.mk>
TIMESTAMP = 1581095322
SHA256 (excess-c64-v1541commander-1.1-v1.1_GH0.tar.gz) = a8cbe7136923ce186b53718a5910a008420c7762e3741a2efd46cb1d8e927db7
SIZE (excess-c64-v1541commander-1.1-v1.1_GH0.tar.gz) = 407212
SHA256 (Zirias-zimk-31500ca_GH0.tar.gz) = e0404e600343460320a41efdec3b432fe7bce76518b08225e01264937b0958ea
SIZE (Zirias-zimk-31500ca_GH0.tar.gz) = 12137
This application allows you to create and modify D64 disk images
(for the Commodore 1541 floppy drive).
WWW: https://github.com/excess-c64/v1541commander
bin/v1541commander
share/applications/v1541commander.desktop
%%PORTDOCS%%%%DOCSDIR%%/BUILDING.md
%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
%%PORTDOCS%%%%DOCSDIR%%/FAQ.txt
%%PORTDOCS%%%%DOCSDIR%%/LICENSE-font.txt
%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
%%PORTDOCS%%%%DOCSDIR%%/README.md
share/icons/hicolor/16x16/apps/v1541commander.png
share/icons/hicolor/16x16/mimetypes/v1541commander-d64.png
share/icons/hicolor/16x16/mimetypes/v1541commander-lynx.png
share/icons/hicolor/16x16/mimetypes/v1541commander-prg.png
share/icons/hicolor/16x16/mimetypes/v1541commander-zipcode.png
share/icons/hicolor/256x256/apps/v1541commander.png
share/icons/hicolor/256x256/mimetypes/v1541commander-d64.png
share/icons/hicolor/256x256/mimetypes/v1541commander-lynx.png
share/icons/hicolor/256x256/mimetypes/v1541commander-prg.png
share/icons/hicolor/256x256/mimetypes/v1541commander-zipcode.png
share/icons/hicolor/32x32/apps/v1541commander.png
share/icons/hicolor/32x32/mimetypes/v1541commander-d64.png
share/icons/hicolor/32x32/mimetypes/v1541commander-lynx.png
share/icons/hicolor/32x32/mimetypes/v1541commander-prg.png
share/icons/hicolor/32x32/mimetypes/v1541commander-zipcode.png
share/icons/hicolor/48x48/apps/v1541commander.png
share/icons/hicolor/48x48/mimetypes/v1541commander-d64.png
share/icons/hicolor/48x48/mimetypes/v1541commander-lynx.png
share/icons/hicolor/48x48/mimetypes/v1541commander-prg.png
share/icons/hicolor/48x48/mimetypes/v1541commander-zipcode.png
share/mime/packages/v1541commander.xml
# $FreeBSD: head/cad/cura/Makefile 529180 2020-03-26 12:06:13Z db $
# $FreeBSD: head/cad/cura/Makefile 529244 2020-03-27 13:08:25Z db $
PORTNAME= Cura
DISTVERSION= 15.06.03-82
DISTVERSION= 4.5.0-82
DISTVERSIONSUFFIX= -g7c70ace
PORTEPOCH= 1
PORTEPOCH= 2
CATEGORIES= cad
DIST_SUBDIR= Ultimaker
......@@ -18,9 +18,13 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}qt5-gui>0:x11-toolkits/py-qt5-gui@${PY_FLAVO
${PYTHON_PKGNAMEPREFIX}qt5-widgets>0:x11-toolkits/py-qt5-widgets@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}qt5-qml>0:lang/py-qt5-qml@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}Shapely>0:devel/py-shapely@${PY_FLAVOR} \
qt5-graphicaleffects>0:graphics/qt5-graphicaleffects \
qt5-quickcontrols2>0:x11-toolkits/qt5-quickcontrols2 \
Uranium>0:cad/uranium \
libCharon>0:net/libcharon \
CuraEngine>0:cad/cura-engine \
fdm_materials>0:cad/fdm_materials \
${PYTHON_PKGNAMEPREFIX}trimesh>0:devel/py-trimesh@${PY_FLAVOR}
LIB_DEPENDS= libArcus.so:net/libarcus \
......
TIMESTAMP = 1584382896
SHA256 (Ultimaker/Ultimaker-Cura-15.06.03-82-g7c70ace-7c70ace_GH0.tar.gz) = 74123ef60aad0a03c334726bd4f6161761324894156a354f2c3c3cb7a4a14d2d
SIZE (Ultimaker/Ultimaker-Cura-15.06.03-82-g7c70ace-7c70ace_GH0.tar.gz) = 34919081
TIMESTAMP = 1585313387
SHA256 (Ultimaker/Ultimaker-Cura-4.5.0-82-g7c70ace-7c70ace_GH0.tar.gz) = 74123ef60aad0a03c334726bd4f6161761324894156a354f2c3c3cb7a4a14d2d
SIZE (Ultimaker/Ultimaker-Cura-4.5.0-82-g7c70ace-7c70ace_GH0.tar.gz) = 34919081
# $FreeBSD: head/cad/lepton-eda/Makefile 528058 2020-03-08 17:01:46Z antoine $
# $FreeBSD: head/cad/lepton-eda/Makefile 529242 2020-03-27 12:10:29Z fernape $
PORTNAME= lepton-eda
PORTVERSION= 1.9.9
DISTVERSIONSUFFIX= -20191003
PORTVERSION= 1.9.10
DISTVERSIONSUFFIX= -20200319
CATEGORIES= cad
MAINTAINER= graahnul.grom@gmail.com
......@@ -10,9 +10,6 @@ COMMENT= Lepton Electronic Design Automation
LICENSE= GPLv2+
DEPRECATED= Uses deprecated version of python
EXPIRATION_DATE= 2020-09-15
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libgc-threaded.so:devel/boehm-gc-threaded \
......@@ -22,19 +19,14 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
USES= autoreconf desktop-file-utils gettext-tools gnome \
groff:build libtool localbase makeinfo pathfix perl5 \
pkgconfig python:2.7,run shared-mime-info shebangfix
pkgconfig shared-mime-info shebangfix
USE_GITHUB= yes
USE_GNOME= cairo gtk20
USE_LDCONFIG= yes
SHEBANG_FILES= utils/scripts/lepton-tragesym \
utils/scripts/lepton-archive.py \
utils/scripts/gschupdate \
utils/scripts/gsymupdate \
utils/scripts/lepton-pcb_backannotate \
SHEBANG_FILES= utils/scripts/lepton-pcb_backannotate \
utils/scripts/lepton-refdes_renum \
utils/scripts/lepton-symfix \
examples/lightning_detector/bom
utils/scripts/lepton-symfix
PORTEXAMPLES= examples/*
......@@ -51,4 +43,13 @@ OPTIONS_SUB= yes
NLS_CONFIGURE_ENABLE= nls
NLS_USES= gettext-runtime
post-patch:
${REINPLACE_CMD} -e \
's,\$$(docdir)/examples,\$$(datadir)/examples/lepton-eda,' \
${WRKSRC}/examples/Makefile.am \
${WRKSRC}/examples/RF_Amp/Makefile.am \
${WRKSRC}/examples/TwoStageAmp/Makefile.am \
${WRKSRC}/examples/gTAG/Makefile.am \
${WRKSRC}/examples/lightning_detector/Makefile.am
.include <bsd.port.mk>
TIMESTAMP = 1570203233
SHA256 (lepton-eda-lepton-eda-1.9.9-20191003_GH0.tar.gz) = 13448d91ae17ab8c5e5cbba56c5a4e6a7cc3b3cb392280cb4d218f50891469d7
SIZE (lepton-eda-lepton-eda-1.9.9-20191003_GH0.tar.gz) = 8361951
TIMESTAMP = 1585112125
SHA256 (lepton-eda-lepton-eda-1.9.10-20200319_GH0.tar.gz) = 271fac1424a963117dfe687846c8d884bc70ed8bf3a50c72ad5cc00741a5c403
SIZE (lepton-eda-lepton-eda-1.9.10-20200319_GH0.tar.gz) = 8386076
--- build-tools/icon-theme-installer.orig 2019-10-03 20:45:55 UTC
+++ build-tools/icon-theme-installer
@@ -103,13 +103,13 @@ if test -z "$INSTALL_BASE_DIR"; then
exit 1
fi
-if test ! -x `echo "$MKINSTALLDIRS_EXEC" | cut -f1 -d' '`; then
- echo "Cannot find '$MKINSTALLDIRS_EXEC'; You probably want to pass -m \$(mkinstalldirs)"
+if test -z "$MKINSTALLDIRS_EXEC"; then
+ echo "\$MKINSTALLDIRS_EXEC is not set. Pass it with the -m command line option"
exit 1
fi
-if test ! -x `echo "$INSTALL_DATA_EXEC" | cut -f1 -d' '`; then
- echo "Cannot find '$INSTALL_DATA_EXEC'; You probably want to pass -x \$(INSTALL_DATA)"
+if test -z "$INSTALL_DATA_EXEC"; then
+ echo "\$INSTALL_DATA_EXEC' is not set. Pass it with the -x command line option"
exit 1
fi
--- docs/scheme-api/Makefile.am.orig 2019-10-09 16:39:51 UTC
+++ docs/scheme-api/Makefile.am
@@ -4,10 +4,8 @@ AM_MAKEINFOHTMLFLAGS = --css-ref=lepton-
EXTRA_DIST = lepton-scheme.css
-html-local:
+all: all-am html
$(MKDIR_P) $(builddir)/lepton-scheme.html/
cp -fv $(srcdir)/lepton-scheme.css $(builddir)/lepton-scheme.html/
-all-local: html
-
install-data-local: install-html
--- examples/Makefile.am.orig 2019-02-23 08:55:55 UTC
+++ examples/Makefile.am
@@ -1,9 +1,9 @@
SUBDIRS = gTAG lightning_detector RF_Amp TwoStageAmp
-exampledir = $(docdir)/examples/
+exampledir = $(datadir)/examples/lepton-eda/
-example_DATA = README
+example_DATA = README
EXTRA_DIST = ChangeLog ChangeLog-1.0 $(example_DATA)
@@ -16,7 +16,7 @@ ChangeLog: $(top_builddir)/stamp-git
) > $@
endif HAVE_GIT_REPO
-MOSTLYCLEANFILES = *.log core FILE *~
-CLEANFILES = *.log core FILE *~
+MOSTLYCLEANFILES = *.log core FILE *~
+CLEANFILES = *.log core FILE *~
DISTCLEANFILES = *.log core FILE *~
MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in ChangeLog
--- examples/RF_Amp/Makefile.am.orig 2019-02-23 08:55:55 UTC
+++ examples/RF_Amp/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = model sym
-exampledir = $(docdir)/examples/RF_Amp/
+exampledir = $(datadir)/examples/lepton-eda/RF_Amp/
example_DATA = 5980-2396E.pdf MSA-2643.cir MSA-2643.sch \
Q1.cir Q1.sch Q2.cir Q2.sch README Simulation.cmd gafrc
--- examples/RF_Amp/model/Makefile.am.orig 2019-02-23 08:55:55 UTC
+++ examples/RF_Amp/model/Makefile.am
@@ -1,7 +1,7 @@
-exampledir = $(docdir)/examples/RF_Amp/model/
+exampledir = $(datadir)/examples/lepton-eda/RF_Amp/model/
example_DATA = BJTM1_Q1.mod BJTM1_Q2.mod DiodeM1_Q1.mod DiodeM1_Q2.mod \
- DiodeM2_Q1.mod DiodeM2_Q2.mod DiodeM3_Q1.mod DiodeM3_Q2.mod
+ DiodeM2_Q1.mod DiodeM2_Q2.mod DiodeM3_Q1.mod DiodeM3_Q2.mod
EXTRA_DIST = $(example_DATA)
--- examples/RF_Amp/sym/Makefile.am.orig 2019-02-23 08:55:55 UTC
+++ examples/RF_Amp/sym/Makefile.am
@@ -1,4 +1,4 @@
-exampledir = $(docdir)/examples/RF_Amp/sym/
+exampledir = $(datadir)/examples/lepton-eda/RF_Amp/sym/
example_DATA = BJT_Model.sym Q_Model.sym spice-subcircuit-IO-1.sym \
spice-subcircuit-LL-1.sym
--- examples/TwoStageAmp/Makefile.am.orig 2019-02-23 08:55:55 UTC
+++ examples/TwoStageAmp/Makefile.am
@@ -1,4 +1,4 @@
-exampledir = $(docdir)/examples/TwoStageAmp/
+exampledir = $(datadir)/examples/lepton-eda/TwoStageAmp/
nobase_example_DATA = \
Simulation.cmd TwoStageAmp.sch spice.netlist gafrc \
--- examples/gTAG/Makefile.am.orig 2019-02-23 08:55:55 UTC
+++ examples/gTAG/Makefile.am
@@ -1,4 +1,4 @@
-exampledir = $(docdir)/examples/gTAG/
+exampledir = $(datadir)/examples/lepton-eda/gTAG/
example_DATA = 7414-1.sym attribs gafrc copyleft.sym crdist.sh \
cy7c64603-52nc.sym gTAG-consio.ps gTAG-consio.sch \
--- examples/lightning_detector/Makefile.am.orig 2019-02-23 08:55:55 UTC
+++ examples/lightning_detector/Makefile.am
@@ -1,11 +1,11 @@
-exampledir = $(docdir)/examples/lightning_detector/
+exampledir = $(datadir)/examples/lepton-eda/lightning_detector/
nobase_example_DATA = \
bom bom.readme lightning.net lightning.pcb lightning.sch \
lightning.sch.bom gafrc \
sym/2N4401.sym sym/2N4403.sym
-EXTRA_DIST = $(nobase_example_DATA)
+EXTRA_DIST = $(nobase_example_DATA)
MOSTLYCLEANFILES = gschem.log *~
CLEANFILES = gschem.log *~
--- liblepton/include/liblepton/geda_list.h.orig 2019-10-03 20:45:55 UTC
+++ liblepton/include/liblepton/geda_list.h
@@ -1,7 +1,8 @@
-/* gEDA - GPL Electronic Design Automation
- * libgeda - gEDA's library
+/* Lepton EDA library
* Copyright (C) 1998-2010 Ales Hvezda
* Copyright (C) 2007-2010 Peter Clifton
+ * Copyright (C) 2011-2015 gEDA Contributors
+ * Copyright (C) 2017-2019 Lepton EDA Contributors
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -56,6 +57,9 @@ void geda_list_add_glist( GedaList *list
void geda_list_remove( GedaList *list, gpointer item );
/*void geda_list_remove_glist( GedaList *list, GList *items ); */ /* Undemanded as yet */
void geda_list_remove_all( GedaList *list );
+void geda_list_move_item( GedaList* list, gpointer item, gint newpos );
+
+
/*const GList *geda_list_get_glist( GedaList *list ); */
#define geda_list_get_glist(list) (list->glist)
--- liblepton/scheme/geda/log-rotate.scm.orig 2019-10-03 20:45:55 UTC
+++ liblepton/scheme/geda/log-rotate.scm
@@ -44,7 +44,7 @@
;; FIXME This should be obtained from the code that decides where to
;; create and populate log files.
(define (log-directory)
- (string-append (user-config-dir) file-name-separator-string "logs"))
+ (string-append (user-cache-dir) file-name-separator-string "logs"))
;;;; get-log-toolname path
;;
--- liblepton/scheme/geda/os.scm.orig 2019-10-03 20:45:55 UTC
+++ liblepton/scheme/geda/os.scm
@@ -49,6 +49,7 @@
(define-public sys-config-dirs %sys-config-dirs)
(define-public user-data-dir %user-data-dir)
(define-public user-config-dir %user-config-dir)
+(define-public user-cache-dir %user-cache-dir)
(define-public expand-env-variables
;; Only compile regular expression once
--- liblepton/src/geda_list.c.orig 2019-10-03 20:45:55 UTC
+++ liblepton/src/geda_list.c
@@ -1,7 +1,8 @@
-/* gEDA - GPL Electronic Design Automation
- * libgeda - gEDA's library
+/* Lepton EDA library
* Copyright (C) 1998-2000 Ales Hvezda
* Copyright (C) 2007-2010 Peter Clifton
+ * Copyright (C) 2011-2013 gEDA Contributors
+ * Copyright (C) 2017-2019 Lepton EDA Contributors
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -179,3 +180,22 @@ void geda_list_remove_all( GedaList *lis
g_signal_emit( list, geda_list_signals[ CHANGED ], 0 );
}
+
+/*! \brief Moves the list data \a item to a new position \a newpos.
+ */
+void geda_list_move_item( GedaList* list, gpointer item, gint newpos )
+{
+ GList* gl = list->glist;
+ GList* node = g_list_find (gl, item);
+
+ if (node != NULL)
+ {
+ gl = g_list_remove_link (gl, node);
+ gl = g_list_insert (gl, item, newpos);
+ g_list_free (node);
+ list->glist = gl;
+
+ g_signal_emit( list, geda_list_signals[ CHANGED ], 0 );
+ }
+}
+
--- liblepton/src/scheme_os.c.orig 2019-10-03 20:45:55 UTC
+++ liblepton/src/scheme_os.c
@@ -153,6 +153,25 @@ SCM_DEFINE (user_config_dir, "%user-conf
return scm_from_locale_string(eda_get_user_config_dir());
}
+/*! \brief Get user cache directory.
+ * \par Function Description
+ * Returns the directory where per-user cache data should be
+ * stored
+ *
+ * \note Scheme API: Implements the %user-cache-dir procedure is the
+ * (geda core os) module.
+ *
+ * \return a string.
+ */
+SCM_DEFINE (user_cache_dir, "%user-cache-dir", 0, 0, 0, (),
+ "Return the directory for user cache data.")
+{
+ /* eda_get_user_cache_dir() returns a raw environment string, so assume
+ * it's in the current locale's encoding. */
+ return scm_from_locale_string (eda_get_user_cache_dir ());
+}
+
+
/*!
* \brief Create the (geda core os) Scheme module.
* \par Function Description
@@ -166,8 +185,12 @@ init_module_geda_core_os (void *unused)
#include "scheme_os.x"
/* Add them to the module's public definitions. */
- scm_c_export (s_platform, s_sys_data_dirs, s_sys_config_dirs,
- s_user_data_dir, s_user_config_dir,
+ scm_c_export (s_platform,
+ s_sys_config_dirs,
+ s_sys_data_dirs,
+ s_user_cache_dir,
+ s_user_config_dir,
+ s_user_data_dir,
NULL);
}
--- netlist/scheme/backend/gnet-spice-sdb.scm.orig 2019-10-03 20:45:55 UTC
+++ netlist/scheme/backend/gnet-spice-sdb.scm
@@ -209,7 +209,7 @@
(and (string-ci=? (gnetlist:get-package-attribute package "device")
"spice-io")
package))
- (filter-map spice-io? ls))
+ (filter-map spice-io? package-list))
;;; Given a list of spice-IO packages (refdeses), this function
--- schematic/src/x_tabs.c.orig 2019-10-03 20:45:55 UTC
+++ schematic/src/x_tabs.c
@@ -53,7 +53,7 @@
* key: use-tabs
* group: schematic.gui
* type: boolean
- * default val: false
+ * default val: true
*
* 2) Whether to show "close" button on tabs:
* key: show-close-button
@@ -75,7 +75,7 @@
static gboolean
-g_x_tabs_enabled = FALSE;
+g_x_tabs_enabled = TRUE;
static gboolean
g_x_tabs_show_close_button = TRUE;
@@ -284,6 +284,28 @@ x_tabs_page_on_sel (GtkNotebook* nbook,
guint ndx,
gpointer data);
+static void
+x_tabs_page_on_reordered (GtkNotebook* nbook,
+ GtkWidget* wtab,
+ guint newindex,
+ gpointer data);
+
+
+static gboolean
+x_tabs_hdr_on_mouse_click (GtkWidget* hdr, GdkEvent* e, gpointer data);
+static GtkMenu*
+x_tabs_menu_create (TabInfo* nfo);
+static void
+x_tabs_menu_create_item (GschemToplevel* toplevel,
+ GtkWidget* menu,
+ const gchar* action_name,
+ const gchar* action_label,
+ const gchar* icon_name);
+static void
+x_tabs_menu_create_item_separ (GtkWidget* menu);
+static void
+x_tabs_menu_item_on_activate (GtkAction* action, gpointer data);
+
/* page view: */
@@ -409,7 +431,24 @@ x_tabs_dbg_pages_dump (GschemToplevel* w
printf( " ^^^^^^^^^^^^^^ pages ^^^^^^^^^^^^^^^^^^\n\n" );
}
-#endif
+static void
+x_tabs_dbg_pages_dump_simple (GschemToplevel* w_current)
+{
+ printf( " >> pages:\n" );
+ g_return_if_fail( w_current != NULL );
+
+ for ( GList* node = w_current->toplevel->pages->glist;
+ node != NULL;
+ node = g_list_next( node ) )
+ {
+ PAGE* p = node->data;
+ printf( " p: [%s]\n", g_path_get_basename( s_page_get_filename(p) ) );
+ }
+
+ printf( "\n" );
+}
+
+#endif /* DEBUG */
@@ -661,6 +700,11 @@ x_tabs_nbook_create (GschemToplevel* w_c
g_signal_connect (nbook, "switch-page",
G_CALLBACK (&x_tabs_page_on_sel), w_current);
+ g_signal_connect (nbook,
+ "page-reordered",
+ G_CALLBACK (&x_tabs_page_on_reordered),
+ w_current);
+
} /* x_tabs_nbook_create() */
@@ -913,7 +957,18 @@ x_tabs_hdr_set (GtkNotebook* nbook, TabI
g_return_if_fail (nfo != NULL);
GtkWidget* hdr = x_tabs_hdr_create (nfo);
- gtk_notebook_set_tab_label (nbook, nfo->wtab_, hdr);
+
+ GtkWidget* ebox = gtk_event_box_new();
+ gtk_event_box_set_visible_window (GTK_EVENT_BOX (ebox), FALSE);
+ gtk_container_add (GTK_CONTAINER (ebox), hdr);
+ gtk_widget_show_all (ebox);
+
+ g_signal_connect (ebox,
+ "button-press-event",
+ G_CALLBACK (&x_tabs_hdr_on_mouse_click),
+ nfo);
+