kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Spreadsheet: Fix header uniformity + trailing whitespace

Browse Source 
[skip ci]
This commit is contained in:
luz paz
2020-11-27 11:09:50 -05:00
committed by wwmayer
parent 5abfdb1405
commit 5bd5f3a963
14 changed files with 172 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp
View File

@@ -1,6 +1,6 @@
/***************************************************************************
* Copyright (c) 2015 Eivind Kvedalen (eivind@kvedalen.name) *
* Copyright (c) 2006 Werner Mayer <wmayer[at]users.sourceforge.net> *
* Copyright (c) 2015 Eivind Kvedalen <eivind@kvedalen.name> *
* *
* This file is part of the FreeCAD CAx development system. *
* *

57
src/Mod/Spreadsheet/Gui/Command.cpp
View File

@@ -1,12 +1,21 @@
/***************************************************************************
* Copyright (c) 2002 Jürgen Riegel <juergen.riegel@web.de> *
* Copyright (c) 2015 Eivind Kvedalen <eivind@kvedalen.name> *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU Library General Public License as *
* published by the Free Software Foundation; either version 2 of the *
* License, or (at your option) any later version. *
* for detail see the LICENCE text file. *
* Jürgen Riegel 2002 *
* Eivind Kvedalen 2015 *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public *
* License along with this library; see the file COPYING.LIB. If not, *
* write to the Free Software Foundation, Inc., 59 Temple Place, *
* Suite 330, Boston, MA 02111-1307, USA *
* *
***************************************************************************/
@@ -43,14 +52,14 @@
#include "ViewProviderSpreadsheet.h"
#include "PropertiesDialog.h"
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
using namespace SpreadsheetGui;
using namespace Spreadsheet;
using namespace Base;
using namespace App;
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
DEF_STD_CMD_A(CmdSpreadsheetMergeCells)
@@ -103,7 +112,7 @@ bool CmdSpreadsheetMergeCells::isActive()
return false;
}
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
DEF_STD_CMD_A(CmdSpreadsheetSplitCell)
@@ -159,7 +168,7 @@ bool CmdSpreadsheetSplitCell::isActive()
return false;
}
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
DEF_STD_CMD_A(CmdSpreadsheetImport)
@@ -199,7 +208,7 @@ bool CmdSpreadsheetImport::isActive()
return getActiveGuiDocument() ? true : false;
}
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
DEF_STD_CMD_A(CmdSpreadsheetExport)
@@ -248,7 +257,7 @@ bool CmdSpreadsheetExport::isActive()
return false;
}
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
DEF_STD_CMD_A(CmdSpreadsheetAlignLeft)
@@ -300,7 +309,7 @@ bool CmdSpreadsheetAlignLeft::isActive()
return false;
}
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
DEF_STD_CMD_A(CmdSpreadsheetAlignCenter)
@@ -352,7 +361,7 @@ bool CmdSpreadsheetAlignCenter::isActive()
return false;
}
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
DEF_STD_CMD_A(CmdSpreadsheetAlignRight)
@@ -404,7 +413,7 @@ bool CmdSpreadsheetAlignRight::isActive()
return false;
}
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
DEF_STD_CMD_A(CmdSpreadsheetAlignTop)
@@ -456,7 +465,7 @@ bool CmdSpreadsheetAlignTop::isActive()
return false;
}
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
DEF_STD_CMD_A(CmdSpreadsheetAlignBottom)
@@ -508,7 +517,7 @@ bool CmdSpreadsheetAlignBottom::isActive()
return false;
}
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
DEF_STD_CMD_A(CmdSpreadsheetAlignVCenter)
@@ -560,7 +569,7 @@ bool CmdSpreadsheetAlignVCenter::isActive()
return false;
}
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
DEF_STD_CMD_A(CmdSpreadsheetStyleBold)
@@ -634,7 +643,7 @@ bool CmdSpreadsheetStyleBold::isActive()
return false;
}
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
DEF_STD_CMD_A(CmdSpreadsheetStyleItalic)
@@ -708,7 +717,7 @@ bool CmdSpreadsheetStyleItalic::isActive()
return false;
}
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
DEF_STD_CMD_A(CmdSpreadsheetStyleUnderline)
@@ -781,7 +790,7 @@ bool CmdSpreadsheetStyleUnderline::isActive()
return false;
}
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
DEF_STD_CMD_A(CmdSpreadsheetSetAlias)
@@ -845,7 +854,7 @@ bool CmdSpreadsheetSetAlias::isActive()
return false;
}
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
DEF_STD_CMD_A(CmdCreateSpreadsheet)
@@ -878,7 +887,7 @@ bool CmdCreateSpreadsheet::isActive()
return App::GetApplication().getActiveDocument();
}
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
void CreateSpreadsheetCommands(void)
{

2
src/Mod/Spreadsheet/Gui/LineEdit.cpp
View File

@@ -1,5 +1,5 @@
/***************************************************************************
* Copyright (c) Eivind Kvedalen (eivind@kvedalen.name) 2015 *
* Copyright (c) 2015 Eivind Kvedalen <eivind@kvedalen.name> *
* *
* This file is part of the FreeCAD CAx development system. *
* *

22
src/Mod/Spreadsheet/Gui/LineEdit.h
View File

@@ -1,3 +1,25 @@
/***************************************************************************
* Copyright (c) 2015 Eivind Kvedalen <eivind@kvedalen.name> *
* *
* This file is part of the FreeCAD CAx development system. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public *
* License along with this library; see the file COPYING.LIB. If not, *
* write to the Free Software Foundation, Inc., 59 Temple Place, *
* Suite 330, Boston, MA 02111-1307, USA *
* *
***************************************************************************/
#ifndef LINEEDIT_H
#define LINEEDIT_H

2
src/Mod/Spreadsheet/Gui/PreCompiled.cpp
View File

@@ -1,5 +1,5 @@
/***************************************************************************
* Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 *
* Copyright (c) 2002 Jürgen Riegel <juergen.riegel@web.de> *
* *
* This file is part of the FreeCAD CAx development system. *
* *

4
src/Mod/Spreadsheet/Gui/PreCompiled.h
View File

@@ -1,6 +1,6 @@
/***************************************************************************
* Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 *
* Copyright (c) Eivind Kvedalen (eivind@kvedalen.name) 2015 *
* Copyright (c) 2002 Jürgen Riegel <juergen.riegel@web.de> *
* Copyright (c) 2015 Eivind Kvedalen <eivind@kvedalen.name> *
* *
* This file is part of the FreeCAD CAx development system. *
* *

2
src/Mod/Spreadsheet/Gui/PropertiesDialog.cpp
View File

@@ -1,5 +1,5 @@
/***************************************************************************
* Copyright (c) Eivind Kvedalen (eivind@kvedalen.name) 2015 *
* Copyright (c) 2015 Eivind Kvedalen <eivind@kvedalen.name> *
* *
* This file is part of the FreeCAD CAx development system. *
* *

2
src/Mod/Spreadsheet/Gui/SheetModel.cpp
View File

@@ -1,5 +1,5 @@
/***************************************************************************
* Copyright (c) Eivind Kvedalen (eivind@kvedalen.name) 2015 *
* Copyright (c) 2015 Eivind Kvedalen <eivind@kvedalen.name> *
* *
* This file is part of the FreeCAD CAx development system. *
* *

6
src/Mod/Spreadsheet/Init.py
View File

@@ -1,8 +1,5 @@
# FreeCAD init script of the Spreadsheet module
# (c) 2001 Juergen Riegel
#***************************************************************************
#* Copyright (c) 2002 Juergen Riegel <juergen.riegel@web.de> *
#* Copyright (c) 2001,2002 Juergen Riegel <juergen.riegel@web.de> *
#* Copyright (c) 2013 Yorik van Havre <yorik@uncreated.net> *
#* Copyright (c) 2013 Eivind Kvedalen <eivind@kvedalen.name> *
#* *
@@ -26,6 +23,7 @@
#* *
#***************************************************************************/
# FreeCAD init script of the Spreadsheet module
# Get the Parameter Group of this module

16
src/Mod/Spreadsheet/InitGui.py
View File

@@ -1,12 +1,5 @@
# Spreadsheet gui init module
# (c) 2003 Juergen Riegel
#
# Gathering all the information to start FreeCAD
# This is the second one of three init scripts, the third one
# runs when the gui is up
#***************************************************************************
#* Copyright (c) 2002 Juergen Riegel <juergen.riegel@web.de> *
#* Copyright (c) 2002,2003 Juergen Riegel <juergen.riegel@web.de> *
#* Copyright (c) 2013 Eivind Kvedalen <eivind@kvedalen.name> *
#* *
#* This file is part of the FreeCAD CAx development system. *
@@ -26,9 +19,14 @@
#* License along with FreeCAD; if not, write to the Free Software *
#* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 *
#* USA *
#* *
#***************************************************************************/
# Spreadsheet gui init module
#
# Gathering all the information to start FreeCAD
# This is the second one of three init scripts, the third one
# runs when the gui is up
class SpreadsheetWorkbench ( Workbench ):
"Spreadsheet workbench object"

23
src/Mod/Spreadsheet/TestSpreadsheet.py
View File

@@ -1,6 +1,23 @@
# (c) 2016 Werner Mayer
# (c) 2016 Eivind Kvedalen
# LGPL
#***************************************************************************
#* Copyright (c) 2016 Werner Mayer <wmayer[at]users.sourceforge.net> *
#* Copyright (c) 2016 Eivind Kvedalen <eivind@kvedalen.name> *
#* *
#* This program is free software; you can redistribute it and/or modify *
#* it under the terms of the GNU General Public License (GPL) *
#* as published by the Free Software Foundation; either version 2 of *
#* the License, or (at your option) any later version. *
#* for detail see the LICENCE text file. *
#* *
#* FreeCAD is distributed in the hope that it will be useful, *
#* but WITHOUT ANY WARRANTY; without even the implied warranty of *
#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
#* GNU Library General Public License for more details. *
#* *
#* You should have received a copy of the GNU Library General Public *
#* License along with FreeCAD; if not, write to the Free Software *
#* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 *
#* USA *
#***************************************************************************/
import os
import sys

45
src/Mod/Spreadsheet/importXLSX.py
View File

@@ -1,31 +1,30 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
# importXLSX.py
#
# This library imports an Excel-XLSX-file into FreeCAD.
#
# Copyright (C) 2016 Ulrich Brammer <ulrich1a@users.sourceforge.net>
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301 USA
#***************************************************************************
#* Copyright (c) 2016 Ulrich Brammer <ulrich1a@users.sourceforge.net> *
#* *
#* This program is free software; you can redistribute it and/or modify *
#* it under the terms of the GNU General Public License (GPL) *
#* as published by the Free Software Foundation; either version 2 of *
#* the License, or (at your option) any later version. *
#* for detail see the LICENCE text file. *
#* *
#* FreeCAD is distributed in the hope that it will be useful, *
#* but WITHOUT ANY WARRANTY; without even the implied warranty of *
#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
#* GNU Library General Public License for more details. *
#* *
#* You should have received a copy of the GNU Library General Public *
#* License along with FreeCAD; if not, write to the Free Software *
#* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 *
#* USA *
#***************************************************************************/
from __future__ import print_function
__title__="FreeCAD Spreadsheet Workbench - XLSX importer"
__title__ = "FreeCAD Spreadsheet Workbench - XLSX importer"
__author__ = "Ulrich Brammer <ulrich1a@users.sourceforge.net>"
__url__ = ["http://www.freecadweb.org"]
__url__ = ["https://www.freecadweb.org"]
'''
This library imports an Excel-XLSX-file into FreeCAD.

5
src/Mod/Spreadsheet/spreadsheet.dox
View File

@@ -1,5 +1,8 @@
/** \defgroup IMAGE Image
/** \defgroup SPREADSHEET Spreadsheet
* \ingroup CWORKBENCHES
* \brief Tools to work with spreadsheets
See \ref src/Mod/Draft/draft.dox as an example of how to populate this page
*/