From patchwork Tue Jul 2 15:22:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: davidgraeff X-Patchwork-Id: 2813441 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 946BEBF4A1 for ; Tue, 2 Jul 2013 15:23:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4BD6620152 for ; Tue, 2 Jul 2013 15:23:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9FDDD20159 for ; Tue, 2 Jul 2013 15:23:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753089Ab3GBPXh (ORCPT ); Tue, 2 Jul 2013 11:23:37 -0400 Received: from mail-ee0-f52.google.com ([74.125.83.52]:34078 "EHLO mail-ee0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753096Ab3GBPXg (ORCPT ); Tue, 2 Jul 2013 11:23:36 -0400 Received: by mail-ee0-f52.google.com with SMTP id c50so2856628eek.11 for ; Tue, 02 Jul 2013 08:23:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=PSPppA5CHC7pgMQ/JsdMAiXf/BIybc4S2nAm8faQeig=; b=LfuPjbjnj5uoZI+BMMmxpjs9C6p+25bsFMM08kotCcgxgxJD8H+9KJAf5PIMPL9Dly Xrym6LIRVelyd7jQPBFe7vb+Cnuunbl/hONuDwk9GJ1GsE/JYT5EN4lwVInH3ZrPV2sG 8hNrRvx5G+qSSVkvrekXGH8OyOrsWIiU3zfTYiLJGjPWqvH4FquHhqulC9zhiI5BQIpB XpCTjnyYgOA025QcSF1qUfPbQ9MiTAaqzpqHdqh+KaRYpdRdlbwb0YkY/AH4DmdUCsRM Xjr/AxmhcfFJx/P/jsjdYuixPBDWqwaPVxAyG88AuMFPyVFpgMG34y8HVHdkARs6MS5I ekRw== X-Received: by 10.14.194.133 with SMTP id m5mr9225691een.109.1372778615186; Tue, 02 Jul 2013 08:23:35 -0700 (PDT) Received: from localhost.localdomain (ip-95-223-112-226.unitymediagroup.de. [95.223.112.226]) by mx.google.com with ESMTPSA id l42sm37233028eeo.14.2013.07.02.08.23.33 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 02 Jul 2013 08:23:34 -0700 (PDT) From: davidgraeff To: Michal Marek Cc: linux-kbuild@vger.kernel.org, davidgraeff Subject: [PATCH 5/9] kconfig: images.c for gtk/qt gui flavour reoganized Date: Tue, 2 Jul 2013 17:22:26 +0200 Message-Id: <1372778550-22110-6-git-send-email-david.graeff@web.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1372778550-22110-1-git-send-email-david.graeff@web.de> References: <1372778550-22110-1-git-send-email-david.graeff@web.de> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Change order of xpm image constants to build up groups. Make those groups optional via ifdefs. --- scripts/kconfig/images.c | 309 ++++++++++++++++++++++++----------------------- 1 file changed, 161 insertions(+), 148 deletions(-) diff --git a/scripts/kconfig/images.c b/scripts/kconfig/images.c index d4f84bd..c8563d9 100644 --- a/scripts/kconfig/images.c +++ b/scripts/kconfig/images.c @@ -3,6 +3,166 @@ * Released under the terms of the GNU GPL v2.0. */ +#ifdef IMAGES_TOOLBAR +static const char *xpm_tree_view[] = { +"22 22 2 1", +". c None", +"# c #000000", +"......................", +"......................", +"......#...............", +"......#...............", +"......#...............", +"......#...............", +"......#...............", +"......########........", +"......#...............", +"......#...............", +"......#...............", +"......#...............", +"......#...............", +"......########........", +"......#...............", +"......#...............", +"......#...............", +"......#...............", +"......#...............", +"......########........", +"......................", +"......................"}; + +static const char *xpm_single_view[] = { +"22 22 2 1", +". c None", +"# c #000000", +"......................", +"......................", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"..........#...........", +"......................", +"......................"}; + +static const char *xpm_split_view[] = { +"22 22 2 1", +". c None", +"# c #000000", +"......................", +"......................", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......#......#........", +"......................", +"......................"}; +#endif + +#ifdef IMAGES_TREEVIEW +static const char *xpm_void[] = { +"12 12 2 1", +" c white", +". c black", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" "}; + +static const char *xpm_menu[] = { +"12 12 2 1", +" c white", +". c black", +" ", +" .......... ", +" . . ", +" . .. . ", +" . .... . ", +" . ...... . ", +" . ...... . ", +" . .... . ", +" . .. . ", +" . . ", +" .......... ", +" "}; +#endif + +/* Most images are taken from the system icon theme + in modern gui toolkits nowadays. + Because we compile with -Wunused-variable, we hide + the following xmp image constants. +*/ +#ifdef IMAGES_EXTENDED + +static const char *xpm_menu_inv[] = { +"12 12 2 1", +" c white", +". c black", +" ", +" .......... ", +" .......... ", +" .. ...... ", +" .. .... ", +" .. .. ", +" .. .. ", +" .. .... ", +" .. ...... ", +" .......... ", +" .......... ", +" "}; + +static const char *xpm_menuback[] = { +"12 12 2 1", +" c white", +". c black", +" ", +" .......... ", +" . . ", +" . .. . ", +" . .... . ", +" . ...... . ", +" . ...... . ", +" . .... . ", +" . .. . ", +" . . ", +" .......... ", +" "}; + static const char *xpm_load[] = { "22 22 5 1", ". c None", @@ -91,86 +251,6 @@ static const char *xpm_back[] = { "......................", "......................"}; -static const char *xpm_tree_view[] = { -"22 22 2 1", -". c None", -"# c #000000", -"......................", -"......................", -"......#...............", -"......#...............", -"......#...............", -"......#...............", -"......#...............", -"......########........", -"......#...............", -"......#...............", -"......#...............", -"......#...............", -"......#...............", -"......########........", -"......#...............", -"......#...............", -"......#...............", -"......#...............", -"......#...............", -"......########........", -"......................", -"......................"}; - -static const char *xpm_single_view[] = { -"22 22 2 1", -". c None", -"# c #000000", -"......................", -"......................", -"..........#...........", -"..........#...........", -"..........#...........", -"..........#...........", -"..........#...........", -"..........#...........", -"..........#...........", -"..........#...........", -"..........#...........", -"..........#...........", -"..........#...........", -"..........#...........", -"..........#...........", -"..........#...........", -"..........#...........", -"..........#...........", -"..........#...........", -"..........#...........", -"......................", -"......................"}; - -static const char *xpm_split_view[] = { -"22 22 2 1", -". c None", -"# c #000000", -"......................", -"......................", -"......#......#........", -"......#......#........", -"......#......#........", -"......#......#........", -"......#......#........", -"......#......#........", -"......#......#........", -"......#......#........", -"......#......#........", -"......#......#........", -"......#......#........", -"......#......#........", -"......#......#........", -"......#......#........", -"......#......#........", -"......#......#........", -"......#......#........", -"......#......#........", -"......................", -"......................"}; static const char *xpm_symbol_no[] = { "12 12 2 1", @@ -256,71 +336,4 @@ static const char *xpm_choice_yes[] = { " .. .. ", " .... ", " "}; - -static const char *xpm_menu[] = { -"12 12 2 1", -" c white", -". c black", -" ", -" .......... ", -" . . ", -" . .. . ", -" . .... . ", -" . ...... . ", -" . ...... . ", -" . .... . ", -" . .. . ", -" . . ", -" .......... ", -" "}; - -static const char *xpm_menu_inv[] = { -"12 12 2 1", -" c white", -". c black", -" ", -" .......... ", -" .......... ", -" .. ...... ", -" .. .... ", -" .. .. ", -" .. .. ", -" .. .... ", -" .. ...... ", -" .......... ", -" .......... ", -" "}; - -static const char *xpm_menuback[] = { -"12 12 2 1", -" c white", -". c black", -" ", -" .......... ", -" . . ", -" . .. . ", -" . .... . ", -" . ...... . ", -" . ...... . ", -" . .... . ", -" . .. . ", -" . . ", -" .......... ", -" "}; - -static const char *xpm_void[] = { -"12 12 2 1", -" c white", -". c black", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" "}; +#endif